| Index: src/arm/code-stubs-arm.cc
 | 
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
 | 
| index a571f9f7cd1068d1c5989b091b2169af9e7a3533..9484f85f97e38ff87de543ec4c25dee3b9d6984e 100644
 | 
| --- a/src/arm/code-stubs-arm.cc
 | 
| +++ b/src/arm/code-stubs-arm.cc
 | 
| @@ -37,17 +37,6 @@ namespace v8 {
 | 
|  namespace internal {
 | 
|  
 | 
|  
 | 
| -void KeyedLoadFastElementStub::InitializeInterfaceDescriptor(
 | 
| -    Isolate* isolate,
 | 
| -    CodeStubInterfaceDescriptor* descriptor) {
 | 
| -  static Register registers[] = { r1, r0 };
 | 
| -  descriptor->register_param_count_ = 2;
 | 
| -  descriptor->register_params_ = registers;
 | 
| -  descriptor->deoptimization_handler_ =
 | 
| -      isolate->builtins()->KeyedLoadIC_Miss();
 | 
| -}
 | 
| -
 | 
| -
 | 
|  #define __ ACCESS_MASM(masm)
 | 
|  
 | 
|  static void EmitIdenticalObjectComparison(MacroAssembler* masm,
 | 
| @@ -514,7 +503,7 @@ void FastCloneShallowObjectStub::Generate(MacroAssembler* masm) {
 | 
|  // 52 fraction bits (20 in the first word, 32 in the second).  Zeros is a
 | 
|  // scratch register.  Destroys the source register.  No GC occurs during this
 | 
|  // stub so you don't have to set up the frame.
 | 
| -class ConvertToDoubleStub : public PlatformCodeStub {
 | 
| +class ConvertToDoubleStub : public CodeStub {
 | 
|   public:
 | 
|    ConvertToDoubleStub(Register result_reg_1,
 | 
|                        Register result_reg_2,
 | 
| @@ -3579,10 +3568,10 @@ void MathPowStub::Generate(MacroAssembler* masm) {
 | 
|    const Register exponent = r2;
 | 
|    const Register heapnumbermap = r5;
 | 
|    const Register heapnumber = r0;
 | 
| -  const DwVfpRegister double_base = d1;
 | 
| -  const DwVfpRegister double_exponent = d2;
 | 
| -  const DwVfpRegister double_result = d3;
 | 
| -  const DwVfpRegister double_scratch = d0;
 | 
| +  const DoubleRegister double_base = d1;
 | 
| +  const DoubleRegister double_exponent = d2;
 | 
| +  const DoubleRegister double_result = d3;
 | 
| +  const DoubleRegister double_scratch = d0;
 | 
|    const SwVfpRegister single_scratch = s0;
 | 
|    const Register scratch = r9;
 | 
|    const Register scratch2 = r7;
 | 
| @@ -3792,29 +3781,12 @@ void CodeStub::GenerateStubsAheadOfTime() {
 | 
|  
 | 
|  
 | 
|  void CodeStub::GenerateFPStubs() {
 | 
| -  SaveFPRegsMode mode = CpuFeatures::IsSupported(VFP2)
 | 
| -      ? kSaveFPRegs
 | 
| -      : kDontSaveFPRegs;
 | 
| -  CEntryStub save_doubles(1, mode);
 | 
| -  StoreBufferOverflowStub stub(mode);
 | 
| -  // These stubs might already be in the snapshot, detect that and don't
 | 
| -  // regenerate, which would lead to code stub initialization state being messed
 | 
| -  // up.
 | 
| -  Code* save_doubles_code = NULL;
 | 
| -  Code* store_buffer_overflow_code = NULL;
 | 
| -  if (!save_doubles.FindCodeInCache(&save_doubles_code, ISOLATE)) {
 | 
| -    if (CpuFeatures::IsSupported(VFP2)) {
 | 
| -      CpuFeatures::Scope scope2(VFP2);
 | 
| -      save_doubles_code = *save_doubles.GetCode();
 | 
| -      store_buffer_overflow_code = *stub.GetCode();
 | 
| -    } else {
 | 
| -      save_doubles_code = *save_doubles.GetCode();
 | 
| -      store_buffer_overflow_code = *stub.GetCode();
 | 
| -    }
 | 
| -    save_doubles_code->set_is_pregenerated(true);
 | 
| -    store_buffer_overflow_code->set_is_pregenerated(true);
 | 
| -  }
 | 
| -  ISOLATE->set_fp_stubs_generated(true);
 | 
| +  CEntryStub save_doubles(1, kSaveFPRegs);
 | 
| +  Handle<Code> code = save_doubles.GetCode();
 | 
| +  code->set_is_pregenerated(true);
 | 
| +  StoreBufferOverflowStub stub(kSaveFPRegs);
 | 
| +  stub.GetCode()->set_is_pregenerated(true);
 | 
| +  code->GetIsolate()->set_fp_stubs_generated(true);
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |