| Index: src/x64/macro-assembler-x64.cc
|
| ===================================================================
|
| --- src/x64/macro-assembler-x64.cc (revision 5696)
|
| +++ src/x64/macro-assembler-x64.cc (working copy)
|
| @@ -315,11 +315,12 @@
|
| }
|
|
|
|
|
| -Object* MacroAssembler::TryCallStub(CodeStub* stub) {
|
| +MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub) {
|
| ASSERT(allow_stub_calls()); // Calls are not allowed in some stubs.
|
| - Object* result = stub->TryGetCode();
|
| + MaybeObject* result = stub->TryGetCode();
|
| if (!result->IsFailure()) {
|
| - call(Handle<Code>(Code::cast(result)), RelocInfo::CODE_TARGET);
|
| + call(Handle<Code>(Code::cast(result->ToObjectUnchecked())),
|
| + RelocInfo::CODE_TARGET);
|
| }
|
| return result;
|
| }
|
| @@ -331,11 +332,12 @@
|
| }
|
|
|
|
|
| -Object* MacroAssembler::TryTailCallStub(CodeStub* stub) {
|
| +MaybeObject* MacroAssembler::TryTailCallStub(CodeStub* stub) {
|
| ASSERT(allow_stub_calls()); // Calls are not allowed in some stubs.
|
| - Object* result = stub->TryGetCode();
|
| + MaybeObject* result = stub->TryGetCode();
|
| if (!result->IsFailure()) {
|
| - jmp(Handle<Code>(Code::cast(result)), RelocInfo::CODE_TARGET);
|
| + jmp(Handle<Code>(Code::cast(result->ToObjectUnchecked())),
|
| + RelocInfo::CODE_TARGET);
|
| }
|
| return result;
|
| }
|
| @@ -379,8 +381,8 @@
|
| }
|
|
|
|
|
| -Object* MacroAssembler::TryCallRuntime(Runtime::FunctionId id,
|
| - int num_arguments) {
|
| +MaybeObject* MacroAssembler::TryCallRuntime(Runtime::FunctionId id,
|
| + int num_arguments) {
|
| return TryCallRuntime(Runtime::FunctionForId(id), num_arguments);
|
| }
|
|
|
| @@ -405,8 +407,8 @@
|
| }
|
|
|
|
|
| -Object* MacroAssembler::TryCallRuntime(Runtime::Function* f,
|
| - int num_arguments) {
|
| +MaybeObject* MacroAssembler::TryCallRuntime(Runtime::Function* f,
|
| + int num_arguments) {
|
| if (f->nargs >= 0 && f->nargs != num_arguments) {
|
| IllegalOperation(num_arguments);
|
| // Since we did not call the stub, there was no allocation failure.
|
|
|