Model exceptional edges from call nodes in TurboFan.

src/compiler/node-properties.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/node-properties.h"
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/operator-properties.h"
 
 namespace v8 {
@@ skipping 134 matching lines @@
 
 
 // static
 void NodeProperties::RemoveNonValueInputs(Node* node) {
   node->TrimInputCount(node->op()->ValueInputCount());
 }
 
 
 // static
 void NodeProperties::ReplaceWithValue(Node* node, Node* value, Node* effect) {
-  DCHECK(node->op()->ControlOutputCount() == 0);
+  // TODO(mstarzinger): Enable once call-sites are in the right order.
+  // DCHECK(node->op()->HasProperty(Operator::kNoThrow));
   if (!effect && node->op()->EffectInputCount() > 0) {
     effect = NodeProperties::GetEffectInput(node);
   }
 
-  // Requires distinguishing between value and effect edges.
+  // Requires distinguishing between value, effect and control edges.
   for (Edge edge : node->use_edges()) {
-    if (IsEffectEdge(edge)) {
+    if (IsControlEdge(edge)) {

[Benedikt Meurer, 2015/02/17 05:58:48]

Please add a unit test for this new behavior to node-properties-unittest.cc.

[Michael Starzinger, 2015/02/17 10:12:06]

Done. Also added unit tests for the existing behavior.

+      DCHECK_EQ(IrOpcode::kIfSuccess, edge.from()->opcode());
+      Node* control = NodeProperties::GetControlInput(node);
+      edge.from()->ReplaceUses(control);
+      edge.UpdateTo(NULL);
+    } else if (IsEffectEdge(edge)) {
       DCHECK_NOT_NULL(effect);
       edge.UpdateTo(effect);
     } else {
       edge.UpdateTo(value);
     }
   }
 }
 
 
 // static
@@ skipping 21 matching lines @@
 // static
 bool NodeProperties::IsInputRange(Edge edge, int first, int num) {
   if (num == 0) return false;
   int const index = edge.index();
   return first <= index && index < first + num;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8