Back out 20899bf87646 (bug 798913) for Windows opt browser-chrome bustage

This commit is contained in:
Phil Ringnalda 2012-10-07 23:26:03 -07:00
parent 00cae8d5b2
commit 621675f4fa
2 changed files with 3 additions and 9 deletions

View File

@ -2885,7 +2885,7 @@ IonBuilder::jsop_call_inline(HandleFunction callee, uint32 argc, bool constructi
}
bool
IonBuilder::makeInliningDecision(AutoObjectVector &targets, uint32 argc)
IonBuilder::makeInliningDecision(AutoObjectVector &targets)
{
if (inliningDepth >= js_IonOptions.maxInlineDepth)
return false;
@ -2913,12 +2913,6 @@ IonBuilder::makeInliningDecision(AutoObjectVector &targets, uint32 argc)
JSScript *script = target->script();
uint32_t calleeUses = script->getUseCount();
if (target->nargs < argc) {
IonSpew(IonSpew_Inlining, "Not inlining, overflow of arguments.");
return false;
}
totalSize += script->length;
if (totalSize > js_IonOptions.inlineMaxTotalBytecodeLength)
return false;
@ -3716,7 +3710,7 @@ IonBuilder::jsop_call(uint32 argc, bool constructing)
}
}
if (numTargets > 0 && makeInliningDecision(targets, argc))
if (numTargets > 0 && makeInliningDecision(targets))
return inlineScriptedCall(targets, argc, constructing, types, barrier);
}

View File

@ -399,7 +399,7 @@ class IonBuilder : public MIRGenerator
Vector<MDefinition *, 8, IonAllocPolicy> &retvalDefns);
bool inlineScriptedCall(AutoObjectVector &targets, uint32 argc, bool constructing,
types::StackTypeSet *types, types::StackTypeSet *barrier);
bool makeInliningDecision(AutoObjectVector &targets, uint32 argc);
bool makeInliningDecision(AutoObjectVector &targets);
MCall *makeCallHelper(HandleFunction target, uint32 argc, bool constructing);
bool makeCallBarrier(HandleFunction target, uint32 argc, bool constructing,