Index: src/compiler/bytecode-graph-builder.cc |
diff --git a/src/compiler/bytecode-graph-builder.cc b/src/compiler/bytecode-graph-builder.cc |
index 60ecd99af19ba3f5b1241fbffd13bada3b4abf80..b5b077e6ed7491c25091d1638ce1d0ed132748c2 100644 |
--- a/src/compiler/bytecode-graph-builder.cc |
+++ b/src/compiler/bytecode-graph-builder.cc |
@@ -1043,7 +1043,8 @@ void BytecodeGraphBuilder::VisitStaLookupSlotStrict() { |
BuildStaLookupSlot(LanguageMode::STRICT); |
} |
-Node* BytecodeGraphBuilder::BuildNamedLoad() { |
+void BytecodeGraphBuilder::VisitLdaNamedProperty() { |
+ PrepareEagerCheckpoint(); |
Node* object = |
environment()->LookupRegister(bytecode_iterator().GetRegisterOperand(0)); |
Handle<Name> name = |
@@ -1052,23 +1053,12 @@ Node* BytecodeGraphBuilder::BuildNamedLoad() { |
CreateVectorSlotPair(bytecode_iterator().GetIndexOperand(2)); |
const Operator* op = javascript()->LoadNamed(name, feedback); |
- return NewNode(op, object, GetFunctionClosure()); |
-} |
- |
-void BytecodeGraphBuilder::VisitLdaNamedProperty() { |
- PrepareEagerCheckpoint(); |
- Node* node = BuildNamedLoad(); |
+ Node* node = NewNode(op, object, GetFunctionClosure()); |
environment()->BindAccumulator(node, Environment::kAttachFrameState); |
} |
-void BytecodeGraphBuilder::VisitLdrNamedProperty() { |
+void BytecodeGraphBuilder::VisitLdaKeyedProperty() { |
PrepareEagerCheckpoint(); |
- Node* node = BuildNamedLoad(); |
- environment()->BindRegister(bytecode_iterator().GetRegisterOperand(3), node, |
- Environment::kAttachFrameState); |
-} |
- |
-Node* BytecodeGraphBuilder::BuildKeyedLoad() { |
Node* key = environment()->LookupAccumulator(); |
Node* object = |
environment()->LookupRegister(bytecode_iterator().GetRegisterOperand(0)); |
@@ -1076,22 +1066,10 @@ Node* BytecodeGraphBuilder::BuildKeyedLoad() { |
CreateVectorSlotPair(bytecode_iterator().GetIndexOperand(1)); |
const Operator* op = javascript()->LoadProperty(feedback); |
- return NewNode(op, object, key, GetFunctionClosure()); |
-} |
- |
-void BytecodeGraphBuilder::VisitLdaKeyedProperty() { |
- PrepareEagerCheckpoint(); |
- Node* node = BuildKeyedLoad(); |
+ Node* node = NewNode(op, object, key, GetFunctionClosure()); |
environment()->BindAccumulator(node, Environment::kAttachFrameState); |
} |
-void BytecodeGraphBuilder::VisitLdrKeyedProperty() { |
- PrepareEagerCheckpoint(); |
- Node* node = BuildKeyedLoad(); |
- environment()->BindRegister(bytecode_iterator().GetRegisterOperand(2), node, |
- Environment::kAttachFrameState); |
-} |
- |
void BytecodeGraphBuilder::BuildNamedStore(LanguageMode language_mode) { |
PrepareEagerCheckpoint(); |
Node* value = environment()->LookupAccumulator(); |