wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798913 - Prevent inlining of overflow of arguments. r=dvander

Browse Source
This commit is contained in:
Nicolas B. Pierron 2012-10-08 18:01:21 -07:00
parent 400b984ab4
commit 360c00abc4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/ion/IonBuilder.cpp
View File

@ -2885,7 +2885,7 @@ IonBuilder::jsop_call_inline(HandleFunction callee, uint32 argc, bool constructi
}
bool
IonBuilder::makeInliningDecision(AutoObjectVector &targets)
IonBuilder::makeInliningDecision(AutoObjectVector &targets, uint32 argc)
{
if (inliningDepth >= js_IonOptions.maxInlineDepth)
return false;
@ -2913,6 +2913,12 @@ IonBuilder::makeInliningDecision(AutoObjectVector &targets)
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;
@ -3710,7 +3716,7 @@ IonBuilder::jsop_call(uint32 argc, bool constructing)
}
}
if (numTargets > 0 && makeInliningDecision(targets))
if (numTargets > 0 && makeInliningDecision(targets, argc))
return inlineScriptedCall(targets, argc, constructing, types, barrier);
}

2
js/src/ion/IonBuilder.h
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);
bool makeInliningDecision(AutoObjectVector &targets, uint32 argc);
MCall *makeCallHelper(HandleFunction target, uint32 argc, bool constructing);
bool makeCallBarrier(HandleFunction target, uint32 argc, bool constructing,