[turbofan] Fix OSR compilations of for-in.

src/compiler/graph-builder.cc

 // Copyright 2013 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/graph-builder.h"
 
 #include "src/bit-vector.h"
 #include "src/compiler.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/node.h"
@@ skipping 183 matching lines @@
     // Merge OSR values as inputs to the phis of the loop.
     Graph* graph = builder_->graph();
     Node* osr_loop_entry = builder_->graph()->NewNode(
         builder_->common()->OsrLoopEntry(), graph->start(), graph->start());
 
     builder_->MergeControl(control, osr_loop_entry);
     builder_->MergeEffect(effect, osr_loop_entry, control);
 
     for (int i = 0; i < size; ++i) {
       Node* val = values()->at(i);
-      // TODO(titzer): use IrOpcode::IsConstant() or similar.
-      if (val->opcode() == IrOpcode::kNumberConstant ||
-          val->opcode() == IrOpcode::kInt32Constant ||
-          val->opcode() == IrOpcode::kInt64Constant ||
-          val->opcode() == IrOpcode::kFloat64Constant ||
-          val->opcode() == IrOpcode::kHeapConstant)
-        continue;
-      Node* osr_value =
-          graph->NewNode(builder_->common()->OsrValue(i), osr_loop_entry);
-      values()->at(i) = builder_->MergeValue(val, osr_value, control);
+      if (!IrOpcode::IsConstantOpcode(val->opcode())) {
+        Node* osr_value =
+            graph->NewNode(builder_->common()->OsrValue(i), osr_loop_entry);
+        values()->at(i) = builder_->MergeValue(val, osr_value, control);
+      }
     }
   }
 }
 
 
 Node* StructuredGraphBuilder::NewPhi(int count, Node* input, Node* control) {
   const Operator* phi_op = common()->Phi(kMachAnyTagged, count);
   Node** buffer = EnsureInputBufferSize(count + 1);
   MemsetPointer(buffer, input, count);
   buffer[count] = control;
@@ skipping 72 matching lines @@
   if (!dead_control_.is_set()) {
     Node* dead_node = graph()->NewNode(common_->Dead());
     dead_control_.set(dead_node);
     return dead_node;
   }
   return dead_control_.get();
 }
 }
 }
 }  // namespace v8::internal::compiler