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..849c14a82e52e2a60cbbfce43536e3399c351a27 100644 |
--- a/src/compiler/raw-machine-assembler.cc |
+++ b/src/compiler/raw-machine-assembler.cc |
@@ -96,6 +96,7 @@ void RawMachineAssembler::Switch(Node* index, RawMachineLabel* default_label, |
void RawMachineAssembler::Return(Node* value) { |
Node* ret = MakeNode(common()->Return(), 1, &value); |
+ NodeProperties::MergeControlToEnd(graph(), common(), ret); |
schedule()->AddReturn(CurrentBlock(), ret); |
current_block_ = nullptr; |
} |
@@ -104,6 +105,7 @@ void RawMachineAssembler::Return(Node* value) { |
void RawMachineAssembler::Return(Node* v1, Node* v2) { |
Node* values[] = {v1, v2}; |
Node* ret = MakeNode(common()->Return(2), 2, values); |
+ NodeProperties::MergeControlToEnd(graph(), common(), ret); |
schedule()->AddReturn(CurrentBlock(), ret); |
current_block_ = nullptr; |
} |
@@ -112,6 +114,7 @@ void RawMachineAssembler::Return(Node* v1, Node* v2) { |
void RawMachineAssembler::Return(Node* v1, Node* v2, Node* v3) { |
Node* values[] = {v1, v2, v3}; |
Node* ret = MakeNode(common()->Return(3), 3, values); |
+ NodeProperties::MergeControlToEnd(graph(), common(), ret); |
schedule()->AddReturn(CurrentBlock(), ret); |
current_block_ = nullptr; |
} |