Bug 864738 - Shell crashes when run with GC zeal 10,1 from command line r=billm
authorJon Coppeard <jcoppeard@mozilla.com>
Wed, 24 Apr 2013 10:45:40 +0100
changeset 140678 cc71d4d9955538c85c791f664c183fd4b93d736a
parent 140677 1065d2c7fd37106d09b5aab55a8eda530903c792
child 140679 dff116662296a26dfdd9ac2ef49f7476ad85d899
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs864738
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 864738 - Shell crashes when run with GC zeal 10,1 from command line r=billm
js/src/vm/SelfHosting.cpp
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -576,17 +576,18 @@ void
 JSRuntime::finishSelfHosting()
 {
     selfHostingGlobal_ = NULL;
 }
 
 void
 JSRuntime::markSelfHostingGlobal(JSTracer *trc)
 {
-    MarkObjectRoot(trc, &selfHostingGlobal_, "self-hosting global");
+    if (selfHostingGlobal_)
+        MarkObjectRoot(trc, &selfHostingGlobal_, "self-hosting global");
 }
 
 typedef AutoObjectObjectHashMap CloneMemory;
 static bool CloneValue(JSContext *cx, MutableHandleValue vp, CloneMemory &clonedObjects);
 
 static bool
 GetUnclonedValue(JSContext *cx, Handle<JSObject*> src, HandleId id, MutableHandleValue vp)
 {