Chromium Code Reviews| Index: src/mips64/macro-assembler-mips64.cc |
| diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc |
| index 97d63a421ca496bc8eea9343d4cc7ffce1ef43ea..724eb427927fefa746c66404ce5c0eb359fc0f9e 100644 |
| --- a/src/mips64/macro-assembler-mips64.cc |
| +++ b/src/mips64/macro-assembler-mips64.cc |
| @@ -6088,16 +6088,17 @@ void MacroAssembler::Abort(BailoutReason reason) { |
| } |
| #endif |
| - li(a0, Operand(Smi::FromInt(reason))); |
| - push(a0); |
| + // Check if Abort() has already been initialized. |
| + DCHECK(isolate()->builtins()->Abort()->IsHeapObject()); |
| + Move(a0, Smi::FromInt(static_cast<int>(reason))); |
|
Michael Starzinger
2016/07/18 08:51:11
nit: Empty newline after this block for readabilit
ahaas
2016/07/18 09:04:17
Done
|
| // Disable stub call restrictions to always allow calls to abort. |
| if (!has_frame_) { |
| // We don't actually want to generate a pile of code for this, so just |
| // claim there is a stack frame, without generating one. |
| FrameScope scope(this, StackFrame::NONE); |
| - CallRuntime(Runtime::kAbort); |
| + Call(isolate()->builtins()->Abort(), RelocInfo::CODE_TARGET); |
| } else { |
| - CallRuntime(Runtime::kAbort); |
| + Call(isolate()->builtins()->Abort(), RelocInfo::CODE_TARGET); |
| } |
| // Will not return here. |
| if (is_trampoline_pool_blocked()) { |