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

Unified Diff: src/compiler/js-intrinsic-lowering.cc

Issue 1021713005: [turbofan]: Integrate basic type feedback for property accesses. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 months 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
Index: src/compiler/js-intrinsic-lowering.cc
diff --git a/src/compiler/js-intrinsic-lowering.cc b/src/compiler/js-intrinsic-lowering.cc
index a3d27ee1a5b98a5e7e9d61c47b8a39682ad1be74..c30e1c51c2bd1e6e77d65251db11be2a1110eeb7 100644
--- a/src/compiler/js-intrinsic-lowering.cc
+++ b/src/compiler/js-intrinsic-lowering.cc
@@ -83,15 +83,7 @@ Reduction JSIntrinsicLowering::ReduceInlineDeoptimizeNow(Node* node) {
graph()->NewNode(common()->Deoptimize(), frame_state, effect, if_true);
// Connect the deopt to the merge exiting the graph.
- Node* end_pred = NodeProperties::GetControlInput(graph()->end());
- if (end_pred->opcode() == IrOpcode::kMerge) {
- int inputs = end_pred->op()->ControlInputCount() + 1;
- end_pred->AppendInput(graph()->zone(), deopt);
- end_pred->set_op(common()->Merge(inputs));
- } else {
- Node* merge = graph()->NewNode(common()->Merge(2), end_pred, deopt);
- NodeProperties::ReplaceControlInput(graph()->end(), merge);
- }
+ NodeProperties::MergeControlToEnd(graph(), common(), deopt);
return Changed(deopt);
}

Powered by Google App Engine
This is Rietveld 408576698