Bug 893184 - Don't attemmpt to get SharedScriptData* from a null code pointer. r=till
☠☠ backed out by 482e7e3edadd ☠ ☠
authorJon Coppeard <jcoppeard@mozilla.com>
Wed, 21 Aug 2013 15:25:53 -0400
changeset 143771 e1b2f6bd92c467bd69f4c3170e52c68d0eca27ec
parent 143770 b820585549821edd2dd8773c5879255cfab30e81
child 143772 5e7bc6009afca70d5343db407596272d96078388
push id32759
push userryanvm@gmail.com
push dateWed, 21 Aug 2013 21:50:26 +0000
treeherdermozilla-inbound@e1b2f6bd92c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstill
bugs893184
milestone26.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 893184 - Don't attemmpt to get SharedScriptData* from a null code pointer. r=till
js/src/jsscript.cpp
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -2801,17 +2801,17 @@ JSScript::markChildren(JSTracer *trc)
         MarkObject(trc, &function_, "function");
 
     if (enclosingScopeOrOriginalFunction_)
         MarkObject(trc, &enclosingScopeOrOriginalFunction_, "enclosing");
 
     if (IS_GC_MARKING_TRACER(trc)) {
         compartment()->mark();
 
-        if (code || natoms)
+        if (code)
             MarkScriptData(trc->runtime, code);
     }
 
     bindings.trace(trc);
 
     if (hasAnyBreakpointsOrStepMode()) {
         for (unsigned i = 0; i < length; i++) {
             BreakpointSite *site = debugScript()->breakpoints[i];