| Index: src/ia32/code-stubs-ia32.cc | 
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc | 
| index 23dfc24b6e9d3f12897b23ad33fe11751896b7ff..da8e2ae4576796285ee2fcbd769beeb3a3f05e39 100644 | 
| --- a/src/ia32/code-stubs-ia32.cc | 
| +++ b/src/ia32/code-stubs-ia32.cc | 
| @@ -40,18 +40,6 @@ | 
| namespace v8 { | 
| namespace internal { | 
|  | 
| - | 
| -void KeyedLoadFastElementStub::InitializeInterfaceDescriptor( | 
| -    Isolate* isolate, | 
| -    CodeStubInterfaceDescriptor* descriptor) { | 
| -  static Register registers[] = { edx, ecx }; | 
| -  descriptor->register_param_count_ = 2; | 
| -  descriptor->register_params_ = registers; | 
| -  descriptor->deoptimization_handler_ = | 
| -      isolate->builtins()->KeyedLoadIC_Miss(); | 
| -} | 
| - | 
| - | 
| #define __ ACCESS_MASM(masm) | 
|  | 
| void ToNumberStub::Generate(MacroAssembler* masm) { | 
| @@ -2438,7 +2426,6 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { | 
|  | 
| __ bind(&loaded); | 
| } else {  // UNTAGGED. | 
| -    CpuFeatures::Scope scope(SSE2); | 
| if (CpuFeatures::IsSupported(SSE4_1)) { | 
| CpuFeatures::Scope sse4_scope(SSE4_1); | 
| __ pextrd(edx, xmm1, 0x1);  // copy xmm1[63..32] to edx. | 
| @@ -2511,7 +2498,6 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { | 
| __ fstp(0); | 
| __ ret(kPointerSize); | 
| } else {  // UNTAGGED. | 
| -    CpuFeatures::Scope scope(SSE2); | 
| __ movdbl(xmm1, FieldOperand(eax, HeapNumber::kValueOffset)); | 
| __ Ret(); | 
| } | 
| @@ -2524,7 +2510,6 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { | 
| if (tagged) { | 
| __ AllocateHeapNumber(eax, edi, no_reg, &runtime_call_clear_stack); | 
| } else {  // UNTAGGED. | 
| -    CpuFeatures::Scope scope(SSE2); | 
| __ AllocateHeapNumber(eax, edi, no_reg, &skip_cache); | 
| __ sub(esp, Immediate(kDoubleSize)); | 
| __ movdbl(Operand(esp, 0), xmm1); | 
| @@ -2539,7 +2524,6 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { | 
| if (tagged) { | 
| __ ret(kPointerSize); | 
| } else {  // UNTAGGED. | 
| -    CpuFeatures::Scope scope(SSE2); | 
| __ movdbl(xmm1, FieldOperand(eax, HeapNumber::kValueOffset)); | 
| __ Ret(); | 
|  | 
| @@ -2572,7 +2556,6 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) { | 
| ExternalReference(RuntimeFunction(), masm->isolate()); | 
| __ TailCallExternalReference(runtime, 1, 1); | 
| } else {  // UNTAGGED. | 
| -    CpuFeatures::Scope scope(SSE2); | 
| __ bind(&runtime_call_clear_stack); | 
| __ bind(&runtime_call); | 
| __ AllocateHeapNumber(eax, edi, no_reg, &skip_cache); | 
| @@ -4825,17 +4808,10 @@ void CodeStub::GenerateStubsAheadOfTime() { | 
|  | 
|  | 
| void CodeStub::GenerateFPStubs() { | 
| -  if (CpuFeatures::IsSupported(SSE2)) { | 
| -    CEntryStub save_doubles(1, kSaveFPRegs); | 
| -    // 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; | 
| -    if (!save_doubles.FindCodeInCache(&save_doubles_code, ISOLATE)) { | 
| -      save_doubles_code = *(save_doubles.GetCode()); | 
| -    } | 
| -    save_doubles_code->set_is_pregenerated(true); | 
| -    save_doubles_code->GetIsolate()->set_fp_stubs_generated(true); | 
| -  } | 
| +  CEntryStub save_doubles(1, kSaveFPRegs); | 
| +  Handle<Code> code = save_doubles.GetCode(); | 
| +  code->set_is_pregenerated(true); | 
| +  code->GetIsolate()->set_fp_stubs_generated(true); | 
| } | 
|  | 
|  | 
|  |