[INFER] Revert 118fb707c569, just initialize varTypes to NULL in ActiveFrame constructor.
authorJan de Mooij <jandemooij@gmail.com>
Mon, 16 May 2011 11:02:18 +0200
changeset 75063 fab81b1881e3db5857d3677d842d41929fcce6d8
parent 75062 118fb707c569d6d60cdd0bf5bc66bd45f5c92f13
child 75064 1b270bc6f9c1110d3436e6f863c296aed0bab05c
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone6.0a1
[INFER] Revert 118fb707c569, just initialize varTypes to NULL in ActiveFrame constructor.
js/src/methodjit/Compiler.cpp
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -450,18 +450,16 @@ mjit::Compiler::pushActiveFrame(JSScript
     for (uint32 i = 0; i < script->length; i++)
         newa->jumpMap[i] = Label();
 #endif
 
     if (cx->typeInferenceEnabled()) {
         CompileStatus status = prepareInferenceTypes(script, newa);
         if (status != Compile_Okay)
             return status;
-    } else {
-        newa->varTypes = NULL;
     }
 
     this->script = script;
     this->analysis = newAnalysis;
     this->PC = script->code;
     this->a = newa;
 
     variadicRejoin = false;
@@ -554,19 +552,19 @@ mjit::Compiler::performCompilation(JITSc
 
     return Compile_Okay;
 }
 
 #undef CHECK_STATUS
 
 mjit::Compiler::ActiveFrame::ActiveFrame(JSContext *cx)
     : parent(NULL), parentPC(NULL), script(NULL), jumpMap(NULL),
-      inlineIndex(uint32(-1)), needReturnValue(false), syncReturnValue(false),
-      returnValueDouble(false), returnSet(false), returnEntry(NULL),
-      returnJumps(NULL), exitState(NULL)
+      inlineIndex(uint32(-1)), varTypes(NULL), needReturnValue(false),
+      syncReturnValue(false), returnValueDouble(false), returnSet(false),
+      returnEntry(NULL), returnJumps(NULL), exitState(NULL)
 {}
 
 mjit::Compiler::ActiveFrame::~ActiveFrame()
 {
     js::Foreground::free_(jumpMap);
     if (varTypes)
         js::Foreground::free_(varTypes);
 }