Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (223158 => 223159)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-11 00:01:28 UTC (rev 223158)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-11 00:09:20 UTC (rev 223159)
@@ -228,9 +228,9 @@
// Handle inlining. Return true if it succeeded, false if we need to plant a call.
bool handleInlining(Node* callTargetNode, int resultOperand, const CallLinkStatus&, int registerOffset, VirtualRegister thisArgument, VirtualRegister argumentsArgument, unsigned argumentsOffset, int argumentCountIncludingThis, unsigned nextOffset, NodeType callOp, InlineCallFrame::Kind, SpeculatedType prediction);
template<typename ChecksFunctor>
- bool attemptToInlineCall(Node* callTargetNode, int resultOperand, CallVariant, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind, SpeculatedType prediction, unsigned& inliningBalance, const ChecksFunctor& insertChecks);
+ bool attemptToInlineCall(Node* callTargetNode, int resultOperand, CallVariant, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind, SpeculatedType prediction, unsigned& inliningBalance, BasicBlock* continuationBlock, const ChecksFunctor& insertChecks);
template<typename ChecksFunctor>
- void inlineCall(Node* callTargetNode, int resultOperand, CallVariant, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind, const ChecksFunctor& insertChecks);
+ void inlineCall(Node* callTargetNode, int resultOperand, CallVariant, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind, BasicBlock* continuationBlock, const ChecksFunctor& insertChecks);
void cancelLinkingForBlock(InlineStackEntry*, BasicBlock*); // Only works when the given block is the last one to have been added for that inline stack entry.
// Handle intrinsic functions. Return true if it succeeded, false if we need to plant a call.
template<typename ChecksFunctor>
@@ -1157,7 +1157,8 @@
VirtualRegister returnValueVR,
VirtualRegister inlineCallFrameStart,
int argumentCountIncludingThis,
- InlineCallFrame::Kind);
+ InlineCallFrame::Kind,
+ BasicBlock* continuationBlock);
~InlineStackEntry()
{
@@ -1510,7 +1511,7 @@
}
template<typename ChecksFunctor>
-void ByteCodeParser::inlineCall(Node* callTargetNode, int resultOperand, CallVariant callee, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind kind, const ChecksFunctor& insertChecks)
+void ByteCodeParser::inlineCall(Node* callTargetNode, int resultOperand, CallVariant callee, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind kind, BasicBlock* continuationBlock, const ChecksFunctor& insertChecks)
{
CodeSpecializationKind specializationKind = InlineCallFrame::specializationKindFor(kind);
@@ -1606,7 +1607,7 @@
}
InlineStackEntry inlineStackEntry(this, codeBlock, codeBlock, callee.function(), resultReg,
- (VirtualRegister)inlineCallFrameStart, argumentCountIncludingThis, kind);
+ (VirtualRegister)inlineCallFrameStart, argumentCountIncludingThis, kind, continuationBlock);
// This is where the actual inlining really happens.
unsigned oldIndex = m_currentIndex;
@@ -1658,7 +1659,7 @@
}
template<typename ChecksFunctor>
-bool ByteCodeParser::attemptToInlineCall(Node* callTargetNode, int resultOperand, CallVariant callee, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind kind, SpeculatedType prediction, unsigned& inliningBalance, const ChecksFunctor& insertChecks)
+bool ByteCodeParser::attemptToInlineCall(Node* callTargetNode, int resultOperand, CallVariant callee, int registerOffset, int argumentCountIncludingThis, unsigned nextOffset, InlineCallFrame::Kind kind, SpeculatedType prediction, unsigned& inliningBalance, BasicBlock* continuationBlock, const ChecksFunctor& insertChecks)
{
CodeSpecializationKind specializationKind = InlineCallFrame::specializationKindFor(kind);
@@ -1681,13 +1682,23 @@
insertChecks(nullptr);
didInsertChecks = true;
};
+
+ auto endSpecialCase = [&] () {
+ RELEASE_ASSERT(didInsertChecks);
+ addToGraph(Phantom, callTargetNode);
+ emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
+ inliningBalance--;
+ if (continuationBlock) {
+ m_currentIndex = nextOffset;
+ m_exitOK = true;
+ processSetLocalQueue();
+ addJumpTo(continuationBlock);
+ }
+ };
if (InternalFunction* function = callee.internalFunction()) {
if (handleConstantInternalFunction(callTargetNode, resultOperand, function, registerOffset, argumentCountIncludingThis, specializationKind, prediction, insertChecksWithAccounting)) {
- RELEASE_ASSERT(didInsertChecks);
- addToGraph(Phantom, callTargetNode);
- emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
- inliningBalance--;
+ endSpecialCase();
return true;
}
RELEASE_ASSERT(!didInsertChecks);
@@ -1697,10 +1708,7 @@
Intrinsic intrinsic = callee.intrinsicFor(specializationKind);
if (intrinsic != NoIntrinsic) {
if (handleIntrinsicCall(callTargetNode, resultOperand, intrinsic, registerOffset, argumentCountIncludingThis, prediction, insertChecksWithAccounting)) {
- RELEASE_ASSERT(didInsertChecks);
- addToGraph(Phantom, callTargetNode);
- emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
- inliningBalance--;
+ endSpecialCase();
return true;
}
@@ -1711,10 +1719,7 @@
if (Options::useDOMJIT()) {
if (const DOMJIT::Signature* signature = callee.signatureFor(specializationKind)) {
if (handleDOMJITCall(callTargetNode, resultOperand, signature, registerOffset, argumentCountIncludingThis, prediction, insertChecksWithAccounting)) {
- RELEASE_ASSERT(didInsertChecks);
- addToGraph(Phantom, callTargetNode);
- emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
- inliningBalance--;
+ endSpecialCase();
return true;
}
RELEASE_ASSERT(!didInsertChecks);
@@ -1727,7 +1732,7 @@
return false;
Instruction* savedCurrentInstruction = m_currentInstruction;
- inlineCall(callTargetNode, resultOperand, callee, registerOffset, argumentCountIncludingThis, nextOffset, kind, insertChecks);
+ inlineCall(callTargetNode, resultOperand, callee, registerOffset, argumentCountIncludingThis, nextOffset, kind, continuationBlock, insertChecks);
inliningBalance -= myInliningCost;
m_currentInstruction = savedCurrentInstruction;
return true;
@@ -1795,7 +1800,7 @@
bool result = attemptToInlineCall(
callTargetNode, resultOperand, callLinkStatus[0], registerOffset,
argumentCountIncludingThis, nextOffset, kind, prediction,
- inliningBalance, [&] (CodeBlock* codeBlock) {
+ inliningBalance, nullptr, [&] (CodeBlock* codeBlock) {
emitFunctionChecks(callLinkStatus[0], callTargetNode, thisArgument);
// If we have a varargs call, we want to extract the arguments right now.
@@ -1939,9 +1944,8 @@
addToGraph(Switch, OpInfo(&data), thingToSwitchOn);
m_currentBlock->didLink();
- // Each inlined callee will have a landing block that it returns at. They should all have jumps
- // to the continuation block, which we create last.
- Vector<BasicBlock*> landingBlocks;
+ BasicBlock* continuationBlock = allocateUntargetableBlock();
+ VERBOSE_LOG("Adding untargetable block ", RawPointer(continuationBlock), " (continuation)\n");
// We may force this true if we give up on inlining any of the edges.
bool couldTakeSlowPath = callLinkStatus.couldTakeSlowPath();
@@ -1960,7 +1964,7 @@
bool inliningResult = attemptToInlineCall(
myCallTargetNode, resultOperand, callLinkStatus[i], registerOffset,
argumentCountIncludingThis, nextOffset, kind, prediction,
- inliningBalance, [&] (CodeBlock*) { });
+ inliningBalance, continuationBlock, [&] (CodeBlock*) { });
if (!inliningResult) {
// That failed so we let the block die. Nothing interesting should have been added to
@@ -1983,32 +1987,15 @@
thingToCaseOn = callLinkStatus[i].executable();
}
data.cases.append(SwitchCase(m_graph.freeze(thingToCaseOn), calleeEntryBlock));
- m_currentIndex = nextOffset;
- m_exitOK = true;
- processSetLocalQueue(); // This only comes into play for intrinsics, since normal inlined code will leave an empty queue.
- if (Node* terminal = m_currentBlock->terminal())
- ASSERT_UNUSED(terminal, terminal->op() == TailCall || terminal->op() == TailCallVarargs || terminal->op() == TailCallForwardVarargs);
- else {
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=177926 we can avoid this indirection in the case of normal inlined call
- // by passing the continuation block all the way into inlineStackEntry->m_continuationBlock in inlineCall.
- // It is not trivial because of the SetLocalQueue managed by intrinsics.
- addToGraph(Jump);
- landingBlocks.append(m_currentBlock);
- }
- VERBOSE_LOG("Marking ", RawPointer(m_currentBlock), " as linked (tail of poly inlinee)\n");
- m_currentBlock->didLink();
-
VERBOSE_LOG("Finished inlining ", callLinkStatus[i], " at ", currentCodeOrigin(), ".\n");
}
-
- BasicBlock* slowPathBlock = allocateUntargetableBlock();
+
+ // Slow path block
+ m_currentBlock = allocateUntargetableBlock();
m_currentIndex = oldOffset;
m_exitOK = true;
- data.fallThrough = BranchTarget(slowPathBlock);
- VERBOSE_LOG("Marking ", RawPointer(slowPathBlock), " as linked (slow path block)\n");
- slowPathBlock->didLink();
+ data.fallThrough = BranchTarget(m_currentBlock);
prepareToParseBlock();
- m_currentBlock = slowPathBlock;
Node* myCallTargetNode = getDirect(calleeReg);
if (couldTakeSlowPath) {
addCall(
@@ -2021,31 +2008,23 @@
emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
set(VirtualRegister(resultOperand), addToGraph(BottomValue));
- VERBOSE_LOG("coultTakeSlowPath was wrong\n");
+ VERBOSE_LOG("couldTakeSlowPath was false\n");
}
m_currentIndex = nextOffset;
m_exitOK = true; // Origin changed, so it's fine to exit again.
processSetLocalQueue();
+
if (Node* terminal = m_currentBlock->terminal())
ASSERT_UNUSED(terminal, terminal->op() == TailCall || terminal->op() == TailCallVarargs || terminal->op() == TailCallForwardVarargs);
else {
- addToGraph(Jump);
- landingBlocks.append(m_currentBlock);
+ addJumpTo(continuationBlock);
}
- // Continuation block
- m_currentBlock = allocateUntargetableBlock();
- VERBOSE_LOG("Adding untargetable block ", RawPointer(m_currentBlock), " (continuation)\n");
prepareToParseBlock();
-
- for (auto &landingBlock : landingBlocks) {
- landingBlock->terminal()->targetBlock() = m_currentBlock;
- landingBlock->didLink();
- VERBOSE_LOG("We linked ", RawPointer(m_currentBlock), " (landing block) to the continuation block \n");
- }
m_currentIndex = oldOffset;
+ m_currentBlock = continuationBlock;
m_exitOK = true;
VERBOSE_LOG("Done inlining (hard).\nStack: ", currentCodeOrigin(), "\n");
@@ -6151,11 +6130,12 @@
VirtualRegister returnValueVR,
VirtualRegister inlineCallFrameStart,
int argumentCountIncludingThis,
- InlineCallFrame::Kind kind)
+ InlineCallFrame::Kind kind,
+ BasicBlock* continuationBlock)
: m_byteCodeParser(byteCodeParser)
, m_codeBlock(codeBlock)
, m_profiledBlock(profiledBlock)
- , m_continuationBlock(nullptr)
+ , m_continuationBlock(continuationBlock)
, m_returnValue(returnValueVR)
, m_caller(byteCodeParser->m_inlineStackTop)
{
@@ -6360,7 +6340,7 @@
InlineStackEntry inlineStackEntry(
this, m_codeBlock, m_profiledBlock, 0, VirtualRegister(), VirtualRegister(),
- m_codeBlock->numParameters(), InlineCallFrame::Call);
+ m_codeBlock->numParameters(), InlineCallFrame::Call, nullptr);
parseCodeBlock();
linkBlocks(inlineStackEntry.m_unlinkedBlocks, inlineStackEntry.m_blockLinkingTargets);
