Index: src/compiler/bytecode-graph-builder.cc |
diff --git a/src/compiler/bytecode-graph-builder.cc b/src/compiler/bytecode-graph-builder.cc |
index bfbf371666ac3c33501dc3babc369acaed7753a2..844a1557eb6853aab4b599a1b53942e077a36405 100644 |
--- a/src/compiler/bytecode-graph-builder.cc |
+++ b/src/compiler/bytecode-graph-builder.cc |
@@ -1394,15 +1394,15 @@ void BytecodeGraphBuilder::VisitToName( |
} |
-void BytecodeGraphBuilder::VisitToNumber( |
+void BytecodeGraphBuilder::VisitToObject( |
const interpreter::BytecodeArrayIterator& iterator) { |
- BuildCastOperator(javascript()->ToNumber(), iterator); |
+ BuildCastOperator(javascript()->ToObject(), iterator); |
} |
-void BytecodeGraphBuilder::VisitToObject( |
+void BytecodeGraphBuilder::VisitToNumber( |
const interpreter::BytecodeArrayIterator& iterator) { |
- BuildCastOperator(javascript()->ToObject(), iterator); |
+ BuildCastOperator(javascript()->ToNumber(), iterator); |
} |
@@ -1513,19 +1513,51 @@ void BytecodeGraphBuilder::VisitReturn( |
void BytecodeGraphBuilder::VisitForInPrepare( |
const interpreter::BytecodeArrayIterator& iterator) { |
- UNIMPLEMENTED(); |
+ // Bytecodes in the boilerplate emitted by the bytecode generator |
+ // have already cast the object to JSReceiver and checked it is |
+ // valid. |
+ Node* receiver = |
+ environment()->LookupRegister(iterator.GetRegisterOperand(0)); |
+ Node* prepare = NewNode(javascript()->ForInPrepare(), receiver); |
+ Node* cache_type = NewNode(common()->Projection(0), prepare); |
+ Node* cache_array = NewNode(common()->Projection(1), prepare); |
+ Node* cache_length = NewNode(common()->Projection(2), prepare); |
+ environment()->BindRegister(iterator.GetRegisterOperand(1), cache_type); |
+ environment()->BindRegister(iterator.GetRegisterOperand(2), cache_array); |
+ environment()->BindRegister(iterator.GetRegisterOperand(3), cache_length); |
+} |
+ |
+ |
+void BytecodeGraphBuilder::VisitForInDone( |
+ const interpreter::BytecodeArrayIterator& iterator) { |
+ Node* index = environment()->LookupRegister(iterator.GetRegisterOperand(0)); |
+ Node* cache_length = |
+ environment()->LookupRegister(iterator.GetRegisterOperand(1)); |
+ Node* exit_cond = NewNode(javascript()->ForInDone(), index, cache_length); |
+ environment()->BindAccumulator(exit_cond); |
} |
void BytecodeGraphBuilder::VisitForInNext( |
const interpreter::BytecodeArrayIterator& iterator) { |
- UNIMPLEMENTED(); |
+ Node* receiver = |
+ environment()->LookupRegister(iterator.GetRegisterOperand(0)); |
+ Node* cache_type = |
+ environment()->LookupRegister(iterator.GetRegisterOperand(1)); |
+ Node* cache_array = |
+ environment()->LookupRegister(iterator.GetRegisterOperand(2)); |
+ Node* index = environment()->LookupRegister(iterator.GetRegisterOperand(3)); |
+ Node* value = NewNode(javascript()->ForInNext(), receiver, cache_array, |
+ cache_type, index); |
+ environment()->BindAccumulator(value); |
} |
-void BytecodeGraphBuilder::VisitForInDone( |
+void BytecodeGraphBuilder::VisitForInStep( |
const interpreter::BytecodeArrayIterator& iterator) { |
- UNIMPLEMENTED(); |
+ Node* index = environment()->LookupRegister(iterator.GetRegisterOperand(0)); |
+ index = NewNode(javascript()->ForInStep(), index); |
+ environment()->BindRegister(iterator.GetRegisterOperand(0), index); |
} |