| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 2b36aeb06a4ef80b180c7570ae48479ca7dd8c75..48e8bff713fb1221d92e2d552fc7f9981b03c2f6 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -1101,24 +1101,16 @@ void MacroAssembler::InvokeFunction(JSFunction* function,
|
| // You can't call a function without a valid frame.
|
| ASSERT(flag == JUMP_FUNCTION || has_frame());
|
|
|
| - ASSERT(function->is_compiled());
|
| -
|
| // Get the function and setup the context.
|
| mov(r1, Operand(Handle<JSFunction>(function)));
|
| ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
|
|
|
| - // Invoke the cached code.
|
| - Handle<Code> code(function->code());
|
| ParameterCount expected(function->shared()->formal_parameter_count());
|
| - if (V8::UseCrankshaft()) {
|
| - // TODO(kasperl): For now, we always call indirectly through the
|
| - // code field in the function to allow recompilation to take effect
|
| - // without changing any of the call sites.
|
| - ldr(r3, FieldMemOperand(r1, JSFunction::kCodeEntryOffset));
|
| - InvokeCode(r3, expected, actual, flag, NullCallWrapper(), call_kind);
|
| - } else {
|
| - InvokeCode(code, expected, actual, RelocInfo::CODE_TARGET, flag, call_kind);
|
| - }
|
| + // We call indirectly through the code field in the function to
|
| + // allow recompilation to take effect without changing any of the
|
| + // call sites.
|
| + ldr(r3, FieldMemOperand(r1, JSFunction::kCodeEntryOffset));
|
| + InvokeCode(r3, expected, actual, flag, NullCallWrapper(), call_kind);
|
| }
|
|
|
|
|
|
|