| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index a10ba25e1ad994f19533aab135287a0ba2cdceb2..f401cfd607f5edb9445e8bd7b5195f86f6bac0ea 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -443,9 +443,9 @@ void Builtins::Generate_ArrayCode(MacroAssembler* masm) {
|
| // Jump to the generic array code if the specialized code cannot handle
|
| // the construction.
|
| __ bind(&generic_array_code);
|
| - Code* code = masm->isolate()->builtins()->builtin(
|
| - Builtins::ArrayCodeGeneric);
|
| - Handle<Code> array_code(code);
|
| +
|
| + Handle<Code> array_code =
|
| + masm->isolate()->builtins()->ArrayCodeGeneric();
|
| __ Jump(array_code, RelocInfo::CODE_TARGET);
|
| }
|
|
|
| @@ -476,9 +476,8 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) {
|
| // Jump to the generic construct code in case the specialized code cannot
|
| // handle the construction.
|
| __ bind(&generic_constructor);
|
| - Code* code = masm->isolate()->builtins()->builtin(
|
| - Builtins::JSConstructStubGeneric);
|
| - Handle<Code> generic_construct_stub(code);
|
| + Handle<Code> generic_construct_stub =
|
| + masm->isolate()->builtins()->JSConstructStubGeneric();
|
| __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
|
| }
|
|
|
| @@ -637,8 +636,8 @@ void Builtins::Generate_JSConstructCall(MacroAssembler* masm) {
|
| // Set expected number of arguments to zero (not changing r0).
|
| __ mov(r2, Operand(0, RelocInfo::NONE));
|
| __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION_AS_CONSTRUCTOR);
|
| - __ Jump(Handle<Code>(masm->isolate()->builtins()->builtin(
|
| - ArgumentsAdaptorTrampoline)), RelocInfo::CODE_TARGET);
|
| + __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| + RelocInfo::CODE_TARGET);
|
| }
|
|
|
|
|
| @@ -911,8 +910,8 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| // r1: constructor function
|
| if (is_api_function) {
|
| __ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
|
| - Handle<Code> code = Handle<Code>(
|
| - isolate->builtins()->builtin(Builtins::HandleApiCallConstruct));
|
| + Handle<Code> code =
|
| + masm->isolate()->builtins()->HandleApiCallConstruct();
|
| ParameterCount expected(0);
|
| __ InvokeCode(code, expected, expected,
|
| RelocInfo::CODE_TARGET, CALL_FUNCTION);
|
| @@ -1046,8 +1045,8 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
|
| // Invoke the code and pass argc as r0.
|
| __ mov(r0, Operand(r3));
|
| if (is_construct) {
|
| - __ Call(Handle<Code>(masm->isolate()->builtins()->builtin(
|
| - Builtins::JSConstructCall)), RelocInfo::CODE_TARGET);
|
| + __ Call(masm->isolate()->builtins()->JSConstructCall(),
|
| + RelocInfo::CODE_TARGET);
|
| } else {
|
| ParameterCount actual(r0);
|
| __ InvokeFunction(r1, actual, CALL_FUNCTION);
|
| @@ -1339,8 +1338,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| // Expected number of arguments is 0 for CALL_NON_FUNCTION.
|
| __ mov(r2, Operand(0, RelocInfo::NONE));
|
| __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
|
| - __ Jump(Handle<Code>(masm->isolate()->builtins()->builtin(
|
| - ArgumentsAdaptorTrampoline)), RelocInfo::CODE_TARGET);
|
| + __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| + RelocInfo::CODE_TARGET);
|
| __ bind(&function);
|
| }
|
|
|
| @@ -1355,8 +1354,9 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| __ mov(r2, Operand(r2, ASR, kSmiTagSize));
|
| __ ldr(r3, FieldMemOperand(r1, JSFunction::kCodeEntryOffset));
|
| __ cmp(r2, r0); // Check formal and actual parameter counts.
|
| - __ Jump(Handle<Code>(masm->isolate()->builtins()->builtin(
|
| - ArgumentsAdaptorTrampoline)), RelocInfo::CODE_TARGET, ne);
|
| + __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| + RelocInfo::CODE_TARGET,
|
| + ne);
|
|
|
| ParameterCount expected(0);
|
| __ InvokeCode(r3, expected, expected, JUMP_FUNCTION);
|
|
|