| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index f797237af523ab64e50017ee9393e40166a84365..7f236b96ed38c7cd3a397e3ef00fd735b2334ef0 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -638,17 +638,18 @@ void MacroAssembler::Abort(BailoutReason reason) {
|
| }
|
| #endif
|
|
|
| - Move(kScratchRegister, Smi::FromInt(static_cast<int>(reason)),
|
| - Assembler::RelocInfoNone());
|
| - Push(kScratchRegister);
|
| + // Check if Abort() has already been initialized.
|
| + DCHECK(isolate()->builtins()->Abort()->IsHeapObject());
|
| +
|
| + Move(rdx, Smi::FromInt(static_cast<int>(reason)));
|
|
|
| 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);
|
| }
|
| // Control will not return here.
|
| int3();
|
|
|