Chromium Code Reviews| Index: src/arm/macro-assembler-arm.cc |
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
| index 2fbd1cf1f8afd7e96221a6bbe20e82dac39b578e..7c134ee9fad4020d1a6f8eac63c40f47a5afa3b3 100644 |
| --- a/src/arm/macro-assembler-arm.cc |
| +++ b/src/arm/macro-assembler-arm.cc |
| @@ -2965,17 +2965,17 @@ void MacroAssembler::Abort(BailoutReason reason) { |
| } |
| #endif |
| - mov(r0, Operand(Smi::FromInt(reason))); |
| - push(r0); |
| - |
| + // Check if Abort() has already been initialized. |
| + DCHECK(isolate()->builtins()->Abort()->IsHeapObject()); |
| + Move(r1, Smi::FromInt(static_cast<int>(reason))); |
|
Michael Starzinger
2016/07/18 08:51:11
nit: Empty newline after "Move" for readability.
ahaas
2016/07/18 09:04:16
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_const_pool_blocked()) { |