Index: src/ic/arm/handler-compiler-arm.cc |
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc |
index 9efe9bcfd275e3b3e1f409ec351e1e85622b3eca..71959265277ebc4be0f2815a9dc53a400df77b2c 100644 |
--- a/src/ic/arm/handler-compiler-arm.cc |
+++ b/src/ic/arm/handler-compiler-arm.cc |
@@ -291,8 +291,8 @@ void ElementHandlerCompiler::GenerateLoadDictionaryElement( |
// The return address is in lr. |
Label slow, miss; |
- Register key = LoadConvention::NameRegister(); |
- Register receiver = LoadConvention::ReceiverRegister(); |
+ Register key = LoadDescriptor::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
DCHECK(receiver.is(r1)); |
DCHECK(key.is(r2)); |
@@ -316,8 +316,8 @@ void ElementHandlerCompiler::GenerateLoadDictionaryElement( |
void NamedStoreHandlerCompiler::GenerateSlow(MacroAssembler* masm) { |
// Push receiver, key and value for runtime call. |
- __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(), |
- StoreConvention::ValueRegister()); |
+ __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(), |
+ StoreDescriptor::ValueRegister()); |
// The slow case calls into the runtime to complete the store without causing |
// an IC miss that would otherwise cause a transition to the generic stub. |
@@ -329,8 +329,8 @@ void NamedStoreHandlerCompiler::GenerateSlow(MacroAssembler* masm) { |
void ElementHandlerCompiler::GenerateStoreSlow(MacroAssembler* masm) { |
// Push receiver, key and value for runtime call. |
- __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(), |
- StoreConvention::ValueRegister()); |
+ __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(), |
+ StoreDescriptor::ValueRegister()); |
// The slow case calls into the runtime to complete the store without causing |
// an IC miss that would otherwise cause a transition to the generic stub. |
@@ -829,7 +829,7 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor( |
Register NamedStoreHandlerCompiler::value() { |
- return StoreConvention::ValueRegister(); |
+ return StoreDescriptor::ValueRegister(); |
} |
@@ -839,7 +839,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal( |
FrontendHeader(receiver(), name, &miss); |
// Get the value from the cell. |
- Register result = StoreConvention::ValueRegister(); |
+ Register result = StoreDescriptor::ValueRegister(); |
__ mov(result, Operand(cell)); |
__ ldr(result, FieldMemOperand(result, Cell::kValueOffset)); |