Index: src/s390/macro-assembler-s390.cc |
diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc |
index 55057e05a673c9461372af164019cdf4c60d1f99..42b317ca17692db839faeeff23503a0c125c8be7 100644 |
--- a/src/s390/macro-assembler-s390.cc |
+++ b/src/s390/macro-assembler-s390.cc |
@@ -2719,16 +2719,19 @@ void MacroAssembler::Abort(BailoutReason reason) { |
} |
#endif |
- LoadSmiLiteral(r0, Smi::FromInt(reason)); |
- push(r0); |
+ // Check if Abort() has already been initialized. |
+ DCHECK(isolate()->builtins()->Abort()->IsHeapObject()); |
+ |
+ LoadSmiLiteral(r3, Smi::FromInt(static_cast<int>(reason))); |
+ |
// 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 |
} |