AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[turbofan] Carefully update frame states during inlining.

Browse Source 
During inlining we should pay attention to only rewire the outer frame
states of the inlinee, but leave any inner frame states of the inlinee
untouched.  Otherwise we might run into trouble once we start caching
graphs, or do getter/setter inlining.

R=jarin@chromium.org

Review URL: https://codereview.chromium.org/1134973006

Cr-Commit-Position: refs/heads/master@{#28466}
This commit is contained in:
bmeurer 2015-05-19 02:11:30 -07:00 committed by Commit bot
parent f659ae4c89
commit fe690c3e82
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/js-inlining.cc
View File

@ -351,10 +351,15 @@ Reduction JSInliner::Reduce(Node* node) {
outer_frame_state = CreateArgumentsAdaptorFrameState(&call, info.zone());
}
for (Node* node : visitor.copies()) {
if (node && node->opcode() == IrOpcode::kFrameState) {
// Fix up all outer frame states from the inlinee.
for (Node* const node : visitor.copies()) {
if (node->opcode() == IrOpcode::kFrameState) {
DCHECK_EQ(1, OperatorProperties::GetFrameStateInputCount(node->op()));
NodeProperties::ReplaceFrameStateInput(node, 0, outer_frame_state);
// Don't touch this frame state, if it already has an "outer frame state".
if (NodeProperties::GetFrameStateInput(node, 0)->opcode() !=
IrOpcode::kFrameState) {
NodeProperties::ReplaceFrameStateInput(node, 0, outer_frame_state);
}
}
}