Bug 880538 - OdinMonkey: don't create an IonContext in MacroAssembler (r=sstangl)

--HG--
extra : rebase_source : c949b8337141681eb983ca4792849a726a059e18

js/src/ion/AsmJS.cpp

@@ -1149,7 +1149,7 @@ class MOZ_STACK_CLASS ModuleCompiler
   public:
     ModuleCompiler(JSContext *cx, TokenStream &ts, ParseNode *fn)
       : cx_(cx),
-        masm_(cx),
+        masm_(MacroAssembler::AsmJSToken()),
         moduleLifo_(LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
         moduleFunctionName_(NULL),
         globals_(cx),
@@ -1529,7 +1529,7 @@ class MOZ_STACK_CLASS ModuleCompiler
                                msTotal, slowFuns ? slowFuns.get() : ""));
     }
 
-    bool finish(ScopedJSDeletePtr<AsmJSModule> *module) {
+    bool staticallyLink(ScopedJSDeletePtr<AsmJSModule> *module) {
         // Finish the code section.
         masm_.finish();
         if (masm_.oom())
@@ -4844,12 +4844,15 @@ GenerateCodeForFinishedJob(ModuleCompiler &m, ParallelGroupState &group, AsmJSPa
         return false;
 
     ModuleCompiler::Func &func = *reinterpret_cast<ModuleCompiler::Func *>(task->func);
-
     func.accumulateCompileTime(task->compileTime);
 
+    {
         // Perform code generation on the main thread.
+        IonContext ionContext(m.cx()->compartment(), &task->mir->temp());
         if (!GenerateCode(m, func, *task->mir, *task->lir))
             return false;
+    }
+
     group.compiledJobs++;
 
     // Clear the LifoAlloc for use by another worker.
@@ -5414,18 +5417,6 @@ GenerateEntry(ModuleCompiler &m, const AsmJSModule::ExportedFunction &exportedFu
 }
 #endif
 
-static bool
-GenerateEntries(ModuleCompiler &m)
-{
-    for (unsigned i = 0; i < m.module().numExportedFunctions(); i++) {
-        m.setEntryOffset(i);
-        if (!GenerateEntry(m, m.module().exportedFunction(i)))
-            return false;
-    }
-
-    return true;
-}
-
 static inline bool
 TryEnablingIon(JSContext *cx, AsmJSModule &module, HandleFunction fun, uint32_t exitIndex,
                int32_t argc, Value *argv)
@@ -5993,7 +5984,7 @@ GenerateFFIExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit, u
 // The stack-overflow exit is called when the stack limit has definitely been
 // exceeded. In this case, we can clobber everything since we are about to pop
 // all the frames.
-static void
+static bool
 GenerateStackOverflowExit(ModuleCompiler &m, Label *throwLabel)
 {
     MacroAssembler &masm = m.masm();
@@ -6031,6 +6022,8 @@ GenerateStackOverflowExit(ModuleCompiler &m, Label *throwLabel)
     void (*pf)(JSContext*) = js_ReportOverRecursed;
     masm.call(ImmWord(JS_FUNC_TO_DATA_PTR(void*, pf)));
     masm.jump(throwLabel);
+
+    return !masm.oom();
 }
 
 // The operation-callback exit is called from arbitrarily-interrupted asm.js
@@ -6041,7 +6034,7 @@ GenerateStackOverflowExit(ModuleCompiler &m, Label *throwLabel)
 // Unfortunately, loading this requires a scratch register which we don't have
 // after restoring all registers. To hack around this, push the resumePC on the
 // stack so that it can be popped directly into PC.
-static void
+static bool
 GenerateOperationCallbackExit(ModuleCompiler &m, Label *throwLabel)
 {
     MacroAssembler &masm = m.masm();
@@ -6146,6 +6139,7 @@ GenerateOperationCallbackExit(ModuleCompiler &m, Label *throwLabel)
 
 #endif
 
+    return !masm.oom();
 }
 
 // If an exception is thrown, simply pop all frames (since asm.js does not
@@ -6153,7 +6147,7 @@ GenerateOperationCallbackExit(ModuleCompiler &m, Label *throwLabel)
 //  1. Restore 'sp' to it's value right after the PushRegsInMask in GenerateEntry.
 //  2. PopRegsInMask to restore the caller's non-volatile registers.
 //  3. Return (to CallAsmJS).
-static void
+static bool
 GenerateThrowExit(ModuleCompiler &m, Label *throwLabel)
 {
     MacroAssembler &masm = m.masm();
@@ -6172,11 +6166,18 @@ GenerateThrowExit(ModuleCompiler &m, Label *throwLabel)
     masm.mov(Imm32(0), ReturnReg);
     masm.abiret();
 
+    return !masm.oom();
 }
 
 static bool
-GenerateExits(ModuleCompiler &m)
+GenerateStubs(ModuleCompiler &m)
 {
+    for (unsigned i = 0; i < m.module().numExportedFunctions(); i++) {
+        m.setEntryOffset(i);
+        if (!GenerateEntry(m, m.module().exportedFunction(i)))
+            return false;
+    }
+
     Label throwLabel;
 
     for (ModuleCompiler::ExitMap::Range r = m.allExits(); !r.empty(); r.popFront()) {
@@ -6185,15 +6186,32 @@ GenerateExits(ModuleCompiler &m)
             return false;
     }
 
-    if (m.stackOverflowLabel().used())
-        GenerateStackOverflowExit(m, &throwLabel);
+    if (m.stackOverflowLabel().used()) {
+        if (!GenerateStackOverflowExit(m, &throwLabel))
+            return false;
+    }
 
-    GenerateOperationCallbackExit(m, &throwLabel);
+    if (!GenerateOperationCallbackExit(m, &throwLabel))
+        return false;
+
+    if (!GenerateThrowExit(m, &throwLabel))
+        return false;
 
-    GenerateThrowExit(m, &throwLabel);
     return true;
 }
 
+static bool
+FinishModule(ModuleCompiler &m, ScopedJSDeletePtr<AsmJSModule> *module)
+{
+    TempAllocator alloc(&m.cx()->tempLifoAlloc());
+    IonContext ionContext(m.cx()->compartment(), &alloc);
+
+    if (!GenerateStubs(m))
+        return false;
+
+    return m.staticallyLink(module);
+}
+
 static bool
 CheckModule(JSContext *cx, TokenStream &ts, ParseNode *fn, ScopedJSDeletePtr<AsmJSModule> *module,
             ScopedJSFreePtr<char> *compilationTimeReport)
@@ -6244,13 +6262,7 @@ CheckModule(JSContext *cx, TokenStream &ts, ParseNode *fn, ScopedJSDeletePtr<Asm
     if (stmtIter)
         return m.fail(stmtIter, "top-level export (return) must be the last statement");
 
-    if (!GenerateEntries(m))
-        return false;
-
-    if (!GenerateExits(m))
-        return false;
-
-    if (!m.finish(module))
+    if (!FinishModule(m, module))
         return false;
 
     m.buildCompilationTimeReport(compilationTimeReport);

js/src/ion/IonMacroAssembler.h

@@ -110,6 +110,19 @@ class MacroAssembler : public MacroAssemblerSpecific
 #endif
     }
 
+    // asm.js compilation handles its own IonContet-pushing
+    struct AsmJSToken {};
+    MacroAssembler(AsmJSToken)
+      : enoughMemory_(true),
+        embedsNurseryPointers_(false),
+        sps_(NULL)
+    {
+#ifdef JS_CPU_ARM
+        initWithAllocator();
+        m_buffer.id = 0;
+#endif
+    }
+
     void setInstrumentation(IonInstrumentation *sps) {
         sps_ = sps;
     }