Index: src/code-stubs-hydrogen.cc |
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc |
index 81304e5002a1fe649e24f294b4d31916ccadddc9..9d63a32be3e475dcbf5bbe98fd92c043b1eb63aa 100644 |
--- a/src/code-stubs-hydrogen.cc |
+++ b/src/code-stubs-hydrogen.cc |
@@ -156,8 +156,8 @@ bool CodeStubGraphBuilderBase::BuildGraph() { |
HParameter::STACK_PARAMETER, r); |
} else { |
param = Add<HParameter>(i, HParameter::REGISTER_PARAMETER, r); |
+ start_environment->Bind(i, param); |
} |
- start_environment->Bind(i, param); |
parameters_[i] = param; |
if (i < register_param_count && IsParameterCountRegister(i)) { |
param->set_type(HType::Smi()); |
@@ -1016,7 +1016,7 @@ Handle<Code> StoreFieldStub::GenerateCode() { return DoGenerateCode(this); } |
template <> |
HValue* CodeStubGraphBuilder<StoreTransitionStub>::BuildCodeStub() { |
- HValue* object = GetParameter(StoreTransitionDescriptor::kReceiverIndex); |
+ HValue* object = GetParameter(StoreTransitionHelper::ReceiverIndex()); |
switch (casted_stub()->store_mode()) { |
case StoreTransitionStub::ExtendStorageAndStoreMapAndValue: { |
@@ -1047,17 +1047,17 @@ HValue* CodeStubGraphBuilder<StoreTransitionStub>::BuildCodeStub() { |
case StoreTransitionStub::StoreMapAndValue: |
// Store the new value into the "extended" object. |
BuildStoreNamedField( |
- object, GetParameter(StoreTransitionDescriptor::kValueIndex), |
+ object, GetParameter(StoreTransitionHelper::ValueIndex()), |
casted_stub()->index(), casted_stub()->representation(), true); |
// Fall through. |
case StoreTransitionStub::StoreMapOnly: |
// And finally update the map. |
Add<HStoreNamedField>(object, HObjectAccess::ForMap(), |
- GetParameter(StoreTransitionDescriptor::kMapIndex)); |
+ GetParameter(StoreTransitionHelper::MapIndex())); |
break; |
} |
- return GetParameter(StoreTransitionDescriptor::kValueIndex); |
+ return GetParameter(StoreTransitionHelper::ValueIndex()); |
} |
@@ -1610,10 +1610,10 @@ Handle<Code> StoreGlobalStub::GenerateCode() { |
template <> |
HValue* CodeStubGraphBuilder<ElementsTransitionAndStoreStub>::BuildCodeStub() { |
- HValue* object = GetParameter(StoreTransitionDescriptor::kReceiverIndex); |
- HValue* key = GetParameter(StoreTransitionDescriptor::kNameIndex); |
- HValue* value = GetParameter(StoreTransitionDescriptor::kValueIndex); |
- HValue* map = GetParameter(StoreTransitionDescriptor::kMapIndex); |
+ HValue* object = GetParameter(StoreTransitionHelper::ReceiverIndex()); |
+ HValue* key = GetParameter(StoreTransitionHelper::NameIndex()); |
+ HValue* value = GetParameter(StoreTransitionHelper::ValueIndex()); |
+ HValue* map = GetParameter(StoreTransitionHelper::MapIndex()); |
if (FLAG_trace_elements_transitions) { |
// Tracing elements transitions is the job of the runtime. |