Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Unified Diff: src/compiler/raw-machine-assembler.cc

Issue 1512543002: [Interpreter] Save bytecode offset in interpreter stack frames. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/compiler/interpreter-assembler.cc ('k') | src/frames.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/compiler/raw-machine-assembler.cc
diff --git a/src/compiler/raw-machine-assembler.cc b/src/compiler/raw-machine-assembler.cc
index 0b93eb9cf19e350bd60807e0e1345cb80855648e..b01c39f0862c5729ed7568d2660a397ee9fc8da0 100644
--- a/src/compiler/raw-machine-assembler.cc
+++ b/src/compiler/raw-machine-assembler.cc
@@ -95,23 +95,27 @@ void RawMachineAssembler::Switch(Node* index, RawMachineLabel* default_label,
void RawMachineAssembler::Return(Node* value) {
- Node* ret = MakeNode(common()->Return(), 1, &value);
+ Node* values[] = {value, graph()->start(), graph()->start()};
titzer 2015/12/08 16:25:45 These extra inputs shouldn't be necessary in order
Michael Starzinger 2015/12/09 16:35:25 As discussed offline, this should no longer be nee
rmcilroy 2015/12/09 16:54:45 Done. PTAL, thanks.
+ Node* ret = MakeNode(common()->Return(), 3, values);
+ NodeProperties::MergeControlToEnd(graph(), common(), ret);
schedule()->AddReturn(CurrentBlock(), ret);
current_block_ = nullptr;
}
void RawMachineAssembler::Return(Node* v1, Node* v2) {
- Node* values[] = {v1, v2};
- Node* ret = MakeNode(common()->Return(2), 2, values);
+ Node* values[] = {v1, v2, graph()->start(), graph()->start()};
+ Node* ret = MakeNode(common()->Return(2), 4, values);
+ NodeProperties::MergeControlToEnd(graph(), common(), ret);
schedule()->AddReturn(CurrentBlock(), ret);
current_block_ = nullptr;
}
void RawMachineAssembler::Return(Node* v1, Node* v2, Node* v3) {
- Node* values[] = {v1, v2, v3};
- Node* ret = MakeNode(common()->Return(3), 3, values);
+ Node* values[] = {v1, v2, v3, graph()->start(), graph()->start()};
+ Node* ret = MakeNode(common()->Return(3), 5, values);
+ NodeProperties::MergeControlToEnd(graph(), common(), ret);
schedule()->AddReturn(CurrentBlock(), ret);
current_block_ = nullptr;
}
« no previous file with comments | « src/compiler/interpreter-assembler.cc ('k') | src/frames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698