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 729278 - Fix construction-related constFun bug introduced by previous patches. (r=jandem)

Browse Source
This commit is contained in:
Kannan Vijayan 2012-07-05 10:24:50 -04:00
parent 18584375fa
commit 677220e136
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2986,12 +2986,29 @@ IonBuilder::inlineScriptedCall(AutoObjectVector &targets, uint32 argc, bool cons
argv, bottom, retvalDefns, Inline_Monomorphic))
return false;
} else {
// Polymorhpic inline case requires guards.
// Polymorphic inline case is not so simple - needs guards.
MBasicBlock *entryBlock = top;
// The final function MConstant is added to the initial entryBlock because
// it's a real pain to add otherwise, since by the last loop iteration, the
// entryBlock will already have its lastIns (as the last inlined function
// flows from the fallbackBlock of the last guard), and adding an MConstant
// then is just not worth it.
MConstant *finalConstFun =
MConstant::New(ObjectValue(*(targets[targets.length()-1]->toFunction())));
entryBlock->add(finalConstFun);
for (size_t i = 0; i < targets.length(); i++) {
// Do the inline function build.
current = entryBlock;
if (i == targets.length() - 1) {
constFun = finalConstFun;
} else {
constFun = MConstant::New(ObjectValue(*(targets[i]->toFunction())));
entryBlock->add(constFun);
}
RootedFunction target(cx, targets[i]->toFunction());
InlinePolymorphism poly = (i == targets.length() - 1) ?
Inline_PolymorphicFinal : Inline_Polymorphic;