Bug 1261826 part 1 - JSScript::fullyInitFromEmitter explicitly use 'main' instead of 'current'. r=jorendorff
authorNicolas B. Pierron <nicolas.b.pierron@mozilla.com>
Tue, 17 May 2016 17:15:52 +0000
changeset 297688 13a71864396dfbd48a764932e16a0abef067c5f3
parent 297687 a7f37ab1e0c3bcd5f43bcadf1b8e6a69abf86f17
child 297689 c922e32b439f2afb13742d27eb11667765a97a3a
push id76868
push usernpierron@mozilla.com
push dateTue, 17 May 2016 17:16:30 +0000
treeherdermozilla-inbound@2e29695fee87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1261826
milestone49.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 1261826 part 1 - JSScript::fullyInitFromEmitter explicitly use 'main' instead of 'current'. r=jorendorff
js/src/jsscript.cpp
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -2981,17 +2981,17 @@ JSScript::fullyInitFromEmitter(Exclusive
     script->setLength(prologueLength + mainLength);
     script->natoms_ = natoms;
     SharedScriptData* ssd = SharedScriptData::new_(cx, script->length(), nsrcnotes, natoms);
     if (!ssd)
         return false;
 
     jsbytecode* code = ssd->data;
     PodCopy<jsbytecode>(code, bce->prologue.code.begin(), prologueLength);
-    PodCopy<jsbytecode>(code + prologueLength, bce->code().begin(), mainLength);
+    PodCopy<jsbytecode>(code + prologueLength, bce->main.code.begin(), mainLength);
     bce->copySrcNotes((jssrcnote*)(code + script->length()), nsrcnotes);
     InitAtomMap(bce->atomIndices.getMap(), ssd->atoms());
 
     if (!SaveSharedScriptData(cx, script, ssd, nsrcnotes))
         return false;
 
 #ifdef DEBUG
     FunctionBox* funbox = bce->sc->isFunctionBox() ? bce->sc->asFunctionBox() : nullptr;