[INFER] Revert 118fb707c569, just initialize varTypes to NULL in ActiveFrame constructor.
[INFER] Revert 118fb707c569, just initialize varTypes to NULL in ActiveFrame constructor.
--- 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);
}