| Index: src/builtins-arm.cc
|
| ===================================================================
|
| --- src/builtins-arm.cc (revision 352)
|
| +++ src/builtins-arm.cc (working copy)
|
| @@ -117,7 +117,6 @@
|
| // r0: number of arguments
|
| // r1: constructor function
|
| Label return_site;
|
| - __ RecordPosition(position);
|
| ParameterCount actual(r0);
|
| __ InvokeFunction(r1, actual, CALL_FUNCTION);
|
| __ bind(&return_site);
|
| @@ -233,7 +232,7 @@
|
| __ mov(r0, Operand(r3));
|
| if (is_construct) {
|
| __ Call(Handle<Code>(Builtins::builtin(Builtins::JSConstructCall)),
|
| - code_target);
|
| + RelocInfo::CODE_TARGET);
|
| } else {
|
| ParameterCount actual(r0);
|
| __ InvokeFunction(r1, actual, CALL_FUNCTION);
|
| @@ -386,7 +385,8 @@
|
| __ b(ne, &invoke);
|
| __ mov(r2, Operand(0)); // expected arguments is 0 for CALL_NON_FUNCTION
|
| __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
|
| - __ Jump(Handle<Code>(builtin(ArgumentsAdaptorTrampoline)), code_target);
|
| + __ Jump(Handle<Code>(builtin(ArgumentsAdaptorTrampoline)),
|
| + RelocInfo::CODE_TARGET);
|
|
|
| __ bind(&invoke);
|
| __ ldr(r3, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
|
| @@ -397,7 +397,8 @@
|
| MemOperand(r3, SharedFunctionInfo::kCodeOffset - kHeapObjectTag));
|
| __ add(r3, r3, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ cmp(r2, r0); // Check formal and actual parameter counts.
|
| - __ Jump(Handle<Code>(builtin(ArgumentsAdaptorTrampoline)), code_target, ne);
|
| + __ Jump(Handle<Code>(builtin(ArgumentsAdaptorTrampoline)),
|
| + RelocInfo::CODE_TARGET, ne);
|
|
|
| // 7. Jump to the code in r3 without checking arguments.
|
| ParameterCount expected(0);
|
|
|