| 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 7722af6479acae22b35c85ec3c89f4b36474313e..9efe9bcfd275e3b3e1f409ec351e1e85622b3eca 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 = LoadIC::NameRegister();
 | 
| -  Register receiver = LoadIC::ReceiverRegister();
 | 
| +  Register key = LoadConvention::NameRegister();
 | 
| +  Register receiver = LoadConvention::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(StoreIC::ReceiverRegister(), StoreIC::NameRegister(),
 | 
| -          StoreIC::ValueRegister());
 | 
| +  __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(),
 | 
| +          StoreConvention::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(StoreIC::ReceiverRegister(), StoreIC::NameRegister(),
 | 
| -          StoreIC::ValueRegister());
 | 
| +  __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(),
 | 
| +          StoreConvention::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.
 | 
| @@ -828,7 +828,9 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor(
 | 
|  }
 | 
|  
 | 
|  
 | 
| -Register NamedStoreHandlerCompiler::value() { return StoreIC::ValueRegister(); }
 | 
| +Register NamedStoreHandlerCompiler::value() {
 | 
| +  return StoreConvention::ValueRegister();
 | 
| +}
 | 
|  
 | 
|  
 | 
|  Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 | 
| @@ -837,7 +839,7 @@ Handle<Code> NamedLoadHandlerCompiler::CompileLoadGlobal(
 | 
|    FrontendHeader(receiver(), name, &miss);
 | 
|  
 | 
|    // Get the value from the cell.
 | 
| -  Register result = StoreIC::ValueRegister();
 | 
| +  Register result = StoreConvention::ValueRegister();
 | 
|    __ mov(result, Operand(cell));
 | 
|    __ ldr(result, FieldMemOperand(result, Cell::kValueOffset));
 | 
|  
 | 
| 
 |