| Index: src/arm/stub-cache-arm.cc
|
| ===================================================================
|
| --- src/arm/stub-cache-arm.cc (revision 4955)
|
| +++ src/arm/stub-cache-arm.cc (working copy)
|
| @@ -367,9 +367,9 @@
|
| ASSERT(kind == Code::LOAD_IC || kind == Code::KEYED_LOAD_IC);
|
| Code* code = NULL;
|
| if (kind == Code::LOAD_IC) {
|
| - code = Builtins::builtin(Builtins::LoadIC_Miss);
|
| + code = Isolate::Current()->builtins()->builtin(Builtins::LoadIC_Miss);
|
| } else {
|
| - code = Builtins::builtin(Builtins::KeyedLoadIC_Miss);
|
| + code = Isolate::Current()->builtins()->builtin(Builtins::KeyedLoadIC_Miss);
|
| }
|
|
|
| Handle<Code> ic(code);
|
| @@ -496,7 +496,7 @@
|
|
|
| // Jump to the fast api call builtin (tail call).
|
| Handle<Code> code = Handle<Code>(
|
| - Builtins::builtin(Builtins::FastHandleApiCall));
|
| + Isolate::Current()->builtins()->builtin(Builtins::FastHandleApiCall));
|
| ParameterCount expected(0);
|
| __ InvokeCode(code, expected, expected,
|
| RelocInfo::CODE_TARGET, JUMP_FUNCTION);
|
| @@ -1495,7 +1495,8 @@
|
| r1, r2, r3,
|
| &miss);
|
| __ bind(&miss);
|
| - Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Miss));
|
| + Handle<Code> ic(Isolate::Current()->builtins()->builtin(
|
| + Builtins::StoreIC_Miss));
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| @@ -1543,7 +1544,8 @@
|
|
|
| // Handle store cache miss.
|
| __ bind(&miss);
|
| - Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Miss));
|
| + Handle<Code> ic(Isolate::Current()->builtins()->builtin(
|
| + Builtins::StoreIC_Miss));
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| @@ -1588,7 +1590,8 @@
|
|
|
| // Handle store cache miss.
|
| __ bind(&miss);
|
| - Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Miss));
|
| + Handle<Code> ic(Isolate::Current()->builtins()->builtin(
|
| + Builtins::StoreIC_Miss));
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| @@ -1622,7 +1625,8 @@
|
| // Handle store cache miss.
|
| __ bind(&miss);
|
| __ IncrementCounter(&Counters::named_store_global_inline_miss, 1, r4, r3);
|
| - Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Miss));
|
| + Handle<Code> ic(Isolate::Current()->builtins()->builtin(
|
| + Builtins::StoreIC_Miss));
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| @@ -2001,7 +2005,8 @@
|
| __ bind(&miss);
|
|
|
| __ DecrementCounter(&Counters::keyed_store_field, 1, r3, r4);
|
| - Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Miss));
|
| + Handle<Code> ic(Isolate::Current()->builtins()->builtin(
|
| + Builtins::KeyedStoreIC_Miss));
|
|
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| @@ -2144,7 +2149,8 @@
|
| // Jump to the generic stub in case the specialized code cannot handle the
|
| // construction.
|
| __ bind(&generic_stub_call);
|
| - Code* code = Builtins::builtin(Builtins::JSConstructStubGeneric);
|
| + Code* code = Isolate::Current()->builtins()->builtin(
|
| + Builtins::JSConstructStubGeneric);
|
| Handle<Code> generic_construct_stub(code);
|
| __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
|
|
|
|
|