| Index: src/arm/macro-assembler-arm.h
|
| diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
|
| index 90c4b375491c175f821966677a42ae2d08e32727..8f6803eabc941fd79eb6846a5173f9cb443714d8 100644
|
| --- a/src/arm/macro-assembler-arm.h
|
| +++ b/src/arm/macro-assembler-arm.h
|
| @@ -520,7 +520,7 @@ class MacroAssembler: public Assembler {
|
| const CallWrapper& call_wrapper,
|
| CallKind call_kind);
|
|
|
| - void InvokeFunction(JSFunction* function,
|
| + void InvokeFunction(Handle<JSFunction> function,
|
| const ParameterCount& actual,
|
| InvokeFlag flag,
|
| CallKind call_kind);
|
| @@ -926,20 +926,9 @@ class MacroAssembler: public Assembler {
|
| // Call a code stub.
|
| void CallStub(CodeStub* stub, Condition cond = al);
|
|
|
| - // Call a code stub and return the code object called. Try to generate
|
| - // the code if necessary. Do not perform a GC but instead return a retry
|
| - // after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryCallStub(CodeStub* stub, Condition cond = al);
|
| -
|
| // Call a code stub.
|
| void TailCallStub(CodeStub* stub, Condition cond = al);
|
|
|
| - // Tail call a code stub (jump) and return the code object called. Try to
|
| - // generate the code if necessary. Do not perform a GC but instead return
|
| - // a retry after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryTailCallStub(CodeStub* stub,
|
| - Condition cond = al);
|
| -
|
| // Call a runtime routine.
|
| void CallRuntime(const Runtime::Function* f, int num_arguments);
|
| void CallRuntimeSaveDoubles(Runtime::FunctionId id);
|
| @@ -958,12 +947,6 @@ class MacroAssembler: public Assembler {
|
| int num_arguments,
|
| int result_size);
|
|
|
| - // Tail call of a runtime routine (jump). Try to generate the code if
|
| - // necessary. Do not perform a GC but instead return a retry after GC
|
| - // failure.
|
| - MUST_USE_RESULT MaybeObject* TryTailCallExternalReference(
|
| - const ExternalReference& ext, int num_arguments, int result_size);
|
| -
|
| // Convenience function: tail call a runtime routine (jump).
|
| void TailCallRuntime(Runtime::FunctionId fid,
|
| int num_arguments,
|
| @@ -1012,18 +995,15 @@ class MacroAssembler: public Assembler {
|
|
|
| void GetCFunctionDoubleResult(const DoubleRegister dst);
|
|
|
| - // Calls an API function. Allocates HandleScope, extracts returned value
|
| - // from handle and propagates exceptions. Restores context.
|
| - // stack_space - space to be unwound on exit (includes the call js
|
| - // arguments space and the additional space allocated for the fast call).
|
| - MaybeObject* TryCallApiFunctionAndReturn(ExternalReference function,
|
| - int stack_space);
|
| + // Calls an API function. Allocates HandleScope, extracts returned value
|
| + // from handle and propagates exceptions. Restores context. stack_space
|
| + // - space to be unwound on exit (includes the call js arguments space and
|
| + // the additional space allocated for the fast call).
|
| + void CallApiFunctionAndReturn(ExternalReference function, int stack_space);
|
|
|
| // Jump to a runtime routine.
|
| void JumpToExternalReference(const ExternalReference& builtin);
|
|
|
| - MaybeObject* TryJumpToExternalReference(const ExternalReference& ext);
|
| -
|
| // Invoke specified builtin JavaScript function. Adds an entry to
|
| // the unresolved list if the name does not resolve.
|
| void InvokeBuiltin(Builtins::JavaScript id,
|
|
|