Bug 822145 - Use correct allocator for CompileInfo on inlined frames, r=sstangl.
authorBrian Hackett <bhackett1024@gmail.com>
Wed, 19 Dec 2012 16:24:42 -0700 (2012-12-19)
changeset 116566 cc2edd53d5e959371915f0fd9e353307609fab3d
parent 116565 a428738147c7dd24ec08bf899b69f48fc5812462
child 116567 61c1733d72df964e394aeeda56ef28161e16ceb8
push id24058
push useremorley@mozilla.com
push dateThu, 20 Dec 2012 21:06:10 +0000 (2012-12-20)
treeherdermozilla-central@868b21bed3eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstangl
bugs822145
milestone20.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 822145 - Use correct allocator for CompileInfo on inlined frames, r=sstangl.
js/src/ion/IonBuilder.cpp
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -3129,22 +3129,21 @@ IonBuilder::jsop_call_inline(HandleFunct
     // Note that we leave the callee on the simulated stack for the
     // duration of the call.
     MDefinitionVector argv;
     if (!argv.resizeUninitialized(argc + 1))
         return false;
     for (int32_t i = argc; i >= 0; i--)
         argv[i] = current->pop();
 
-    // Compilation information is allocated for the duration of the current tempLifoAlloc
-    // lifetime.
+    LifoAlloc *alloc = GetIonContext()->temp->lifoAlloc();
     RootedScript calleeScript(cx, callee->nonLazyScript());
-    CompileInfo *info = cx->tempLifoAlloc().new_<CompileInfo>(calleeScript.get(), callee,
-                                                              (jsbytecode *)NULL, constructing,
-                                                              SequentialExecution);
+    CompileInfo *info = alloc->new_<CompileInfo>(calleeScript.get(), callee,
+                                                 (jsbytecode *)NULL, constructing,
+                                                 SequentialExecution);
     if (!info)
         return false;
 
     MIRGraphExits saveExits;
     AutoAccumulateExits aae(graph(), saveExits);
 
     TypeInferenceOracle oracle;
     if (!oracle.init(cx, calleeScript))