[codegen] Remove dead argument to Assembler::stop

The {msg} argument to Assembler::stop is dead since
https://crrev.com/2178093003 (July 2016). This CL removes it.

R=mstarzinger@chromium.org

Bug: v8:9396
Change-Id: I1593361709ab4977760f1ea21e3008797ef99cab
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1692925
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#62623}
This commit is contained in:
Clemens Hammacher 2019-07-09 14:01:18 +02:00 committed by Commit Bot
parent 63bcc12775
commit 0fd3766b62
30 changed files with 67 additions and 70 deletions

View File

@ -2580,7 +2580,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ tst(sp, Operand(frame_alignment_mask));
__ b(eq, &alignment_as_expected);
// Don't use Check here, as it will call Runtime_Abort re-entering here.
__ stop("Unexpected alignment");
__ stop();
__ bind(&alignment_as_expected);
}
}
@ -2609,7 +2609,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ CompareRoot(r3, RootIndex::kTheHoleValue);
// Cannot use check here as it attempts to generate call into runtime.
__ b(eq, &okay);
__ stop("Unexpected pending exception");
__ stop();
__ bind(&okay);
}

View File

@ -2568,7 +2568,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ LoadRoot(t0, RootIndex::kTheHoleValue);
// Cannot use check here as it attempts to generate call into runtime.
__ Branch(&okay, eq, t0, Operand(a2));
__ stop("Unexpected pending exception");
__ stop();
__ bind(&okay);
}

View File

@ -2605,7 +2605,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ LoadRoot(a4, RootIndex::kTheHoleValue);
// Cannot use check here as it attempts to generate call into runtime.
__ Branch(&okay, eq, a4, Operand(a2));
__ stop("Unexpected pending exception");
__ stop();
__ bind(&okay);
}

View File

@ -2694,7 +2694,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ CompareRoot(r6, RootIndex::kTheHoleValue);
// Cannot use check here as it attempts to generate call into runtime.
__ beq(&okay);
__ stop("Unexpected pending exception");
__ stop();
__ bind(&okay);
}

View File

@ -2755,7 +2755,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
__ CompareRoot(r1, RootIndex::kTheHoleValue);
// Cannot use check here as it attempts to generate call into runtime.
__ beq(&okay, Label::kNear);
__ stop("Unexpected pending exception");
__ stop();
__ bind(&okay);
}
@ -3319,7 +3319,7 @@ void Builtins::Generate_CallApiGetter(MacroAssembler* masm) {
void Builtins::Generate_DirectCEntry(MacroAssembler* masm) {
// Unused.
__ stop(0);
__ stop();
}
#undef __

View File

@ -2210,7 +2210,7 @@ void Assembler::stm(BlockAddrMode am, Register base, RegList src,
// Exception-generating instructions and debugging support.
// Stops with a non-negative code less than kNumOfWatchedStops support
// enabling/disabling and a counter feature. See simulator-arm.h .
void Assembler::stop(const char* msg, Condition cond, int32_t code) {
void Assembler::stop(Condition cond, int32_t code) {
#ifndef __arm__
DCHECK_GE(code, kDefaultStopCode);
{

View File

@ -625,8 +625,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
void stm(BlockAddrMode am, Register base, RegList src, Condition cond = al);
// Exception-generating instructions and debugging support
void stop(const char* msg, Condition cond = al,
int32_t code = kDefaultStopCode);
void stop(Condition cond = al, int32_t code = kDefaultStopCode);
void bkpt(uint32_t imm16); // v5 and above
void svc(uint32_t imm24, Condition cond = al);

View File

@ -636,7 +636,7 @@ void MacroAssembler::RecordWriteField(Register object, int offset,
add(scratch, object, Operand(offset - kHeapObjectTag));
tst(scratch, Operand(kPointerSize - 1));
b(eq, &ok);
stop("Unaligned cell in write barrier");
stop();
bind(&ok);
}
@ -1955,15 +1955,15 @@ void TurboAssembler::Check(Condition cond, AbortReason reason) {
void TurboAssembler::Abort(AbortReason reason) {
Label abort_start;
bind(&abort_start);
const char* msg = GetAbortReason(reason);
#ifdef DEBUG
const char* msg = GetAbortReason(reason);
RecordComment("Abort message: ");
RecordComment(msg);
#endif
// Avoid emitting call to builtin if requested.
if (trap_on_abort()) {
stop(msg);
stop();
return;
}
@ -2406,7 +2406,7 @@ void TurboAssembler::CallCFunctionHelper(Register function,
b(eq, &alignment_as_expected);
// Don't use Check here, as it will call Runtime_Abort possibly
// re-entering here.
stop("Unexpected alignment");
stop();
bind(&alignment_as_expected);
}
}

View File

@ -2211,7 +2211,7 @@ void Assembler::break_(uint32_t code, bool break_as_stop) {
emit(break_instr);
}
void Assembler::stop(const char* msg, uint32_t code) {
void Assembler::stop(uint32_t code) {
DCHECK_GT(code, kMaxWatchpointCode);
DCHECK_LE(code, kMaxStopCode);
#if V8_HOST_ARCH_MIPS

View File

@ -558,7 +558,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
// Break / Trap instructions.
void break_(uint32_t code, bool break_as_stop = false);
void stop(const char* msg, uint32_t code = kMaxStopCode);
void stop(uint32_t code = kMaxStopCode);
void tge(Register rs, Register rt, uint16_t code);
void tgeu(Register rs, Register rt, uint16_t code);
void tlt(Register rs, Register rt, uint16_t code);

View File

@ -189,7 +189,7 @@ void MacroAssembler::RecordWriteField(Register object, int offset,
Label ok;
And(t8, dst, Operand(kPointerSize - 1));
Branch(&ok, eq, t8, Operand(zero_reg));
stop("Unaligned cell in write barrier");
stop();
bind(&ok);
}
@ -4703,15 +4703,15 @@ void TurboAssembler::Check(Condition cc, AbortReason reason, Register rs,
void TurboAssembler::Abort(AbortReason reason) {
Label abort_start;
bind(&abort_start);
const char* msg = GetAbortReason(reason);
#ifdef DEBUG
const char* msg = GetAbortReason(reason);
RecordComment("Abort message: ");
RecordComment(msg);
#endif
// Avoid emitting call to builtin if requested.
if (trap_on_abort()) {
stop(msg);
stop();
return;
}
@ -4947,7 +4947,7 @@ void MacroAssembler::AssertStackIsAligned() {
andi(scratch, sp, frame_alignment_mask);
Branch(&alignment_as_expected, eq, scratch, Operand(zero_reg));
// Don't use Check here, as it will call Runtime_Abort re-entering here.
stop("Unexpected stack alignment");
stop();
bind(&alignment_as_expected);
}
}
@ -5361,7 +5361,7 @@ void TurboAssembler::CallCFunctionHelper(Register function_base,
Branch(&alignment_as_expected, eq, scratch, Operand(zero_reg));
// Don't use Check here, as it will call Runtime_Abort possibly
// re-entering here.
stop("Unexpected alignment in CallCFunction");
stop();
bind(&alignment_as_expected);
}
}

View File

@ -2344,7 +2344,7 @@ void Assembler::break_(uint32_t code, bool break_as_stop) {
emit(break_instr);
}
void Assembler::stop(const char* msg, uint32_t code) {
void Assembler::stop(uint32_t code) {
DCHECK_GT(code, kMaxWatchpointCode);
DCHECK_LE(code, kMaxStopCode);
#if defined(V8_HOST_ARCH_MIPS) || defined(V8_HOST_ARCH_MIPS64)

View File

@ -601,7 +601,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
// Break / Trap instructions.
void break_(uint32_t code, bool break_as_stop = false);
void stop(const char* msg, uint32_t code = kMaxStopCode);
void stop(uint32_t code = kMaxStopCode);
void tge(Register rs, Register rt, uint16_t code);
void tgeu(Register rs, Register rt, uint16_t code);
void tlt(Register rs, Register rt, uint16_t code);

View File

@ -187,7 +187,7 @@ void MacroAssembler::RecordWriteField(Register object, int offset,
Label ok;
And(t8, dst, Operand(kPointerSize - 1));
Branch(&ok, eq, t8, Operand(zero_reg));
stop("Unaligned cell in write barrier");
stop();
bind(&ok);
}
@ -5035,15 +5035,15 @@ void TurboAssembler::Check(Condition cc, AbortReason reason, Register rs,
void TurboAssembler::Abort(AbortReason reason) {
Label abort_start;
bind(&abort_start);
const char* msg = GetAbortReason(reason);
#ifdef DEBUG
const char* msg = GetAbortReason(reason);
RecordComment("Abort message: ");
RecordComment(msg);
#endif
// Avoid emitting call to builtin if requested.
if (trap_on_abort()) {
stop(msg);
stop();
return;
}
@ -5282,7 +5282,7 @@ void MacroAssembler::AssertStackIsAligned() {
Branch(&alignment_as_expected, eq, scratch, Operand(zero_reg));
}
// Don't use Check here, as it will call Runtime_Abort re-entering here.
stop("Unexpected stack alignment");
stop();
bind(&alignment_as_expected);
}
}
@ -5707,7 +5707,7 @@ void TurboAssembler::CallCFunctionHelper(Register function,
}
// Don't use Check here, as it will call Runtime_Abort possibly
// re-entering here.
stop("Unexpected alignment in CallCFunction");
stop();
bind(&alignment_as_expected);
}
}

View File

@ -1490,8 +1490,7 @@ void Assembler::mtfprwa(DoubleRegister dst, Register src) {
// Exception-generating instructions and debugging support.
// Stops with a non-negative code less than kNumOfWatchedStops support
// enabling/disabling and a counter feature. See simulator-ppc.h .
void Assembler::stop(const char* msg, Condition cond, int32_t code,
CRegister cr) {
void Assembler::stop(Condition cond, int32_t code, CRegister cr) {
if (cond != al) {
Label skip;
b(NegateCondition(cond), &skip, cr);

View File

@ -841,8 +841,8 @@ class Assembler : public AssemblerBase {
void function_descriptor();
// Exception-generating instructions and debugging support
void stop(const char* msg, Condition cond = al,
int32_t code = kDefaultStopCode, CRegister cr = cr7);
void stop(Condition cond = al, int32_t code = kDefaultStopCode,
CRegister cr = cr7);
void bkpt(uint32_t imm16); // v5 and above

View File

@ -419,7 +419,7 @@ void MacroAssembler::RecordWriteField(Register object, int offset,
Label ok;
andi(r0, dst, Operand(kPointerSize - 1));
beq(&ok, cr0);
stop("Unaligned cell in write barrier");
stop();
bind(&ok);
}
@ -1721,15 +1721,15 @@ void TurboAssembler::Check(Condition cond, AbortReason reason, CRegister cr) {
void TurboAssembler::Abort(AbortReason reason) {
Label abort_start;
bind(&abort_start);
const char* msg = GetAbortReason(reason);
#ifdef DEBUG
const char* msg = GetAbortReason(reason);
RecordComment("Abort message: ");
RecordComment(msg);
#endif
// Avoid emitting call to builtin if requested.
if (trap_on_abort()) {
stop(msg);
stop();
return;
}

View File

@ -636,8 +636,7 @@ void Assembler::branchOnCond(Condition c, int branch_offset, bool is_bound) {
// Exception-generating instructions and debugging support.
// Stops with a non-negative code less than kNumOfWatchedStops support
// enabling/disabling and a counter feature. See simulator-s390.h .
void Assembler::stop(const char* msg, Condition cond, int32_t code,
CRegister cr) {
void Assembler::stop(Condition cond, int32_t code, CRegister cr) {
if (cond != al) {
Label skip;
b(NegateCondition(cond), &skip, Label::kNear);

View File

@ -1261,8 +1261,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
void larl(Register r, Label* l);
// Exception-generating instructions and debugging support
void stop(const char* msg, Condition cond = al,
int32_t code = kDefaultStopCode, CRegister cr = cr7);
void stop(Condition cond = al, int32_t code = kDefaultStopCode,
CRegister cr = cr7);
void bkpt(uint32_t imm16); // v5 and above

View File

@ -440,7 +440,7 @@ void MacroAssembler::RecordWriteField(Register object, int offset,
Label ok;
AndP(r0, dst, Operand(kPointerSize - 1));
beq(&ok, Label::kNear);
stop("Unaligned cell in write barrier");
stop();
bind(&ok);
}
@ -1670,15 +1670,15 @@ void TurboAssembler::Check(Condition cond, AbortReason reason, CRegister cr) {
void TurboAssembler::Abort(AbortReason reason) {
Label abort_start;
bind(&abort_start);
const char* msg = GetAbortReason(reason);
#ifdef DEBUG
const char* msg = GetAbortReason(reason);
RecordComment("Abort message: ");
RecordComment(msg);
#endif
// Avoid emitting call to builtin if requested.
if (trap_on_abort()) {
stop(msg);
stop();
return;
}

View File

@ -893,7 +893,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
__ Call(isolate()->builtins()->builtin_handle(Builtins::kAbortJS),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortJS");
__ stop();
unwinding_info_writer_.MarkBlockWillExit();
break;
case kArchAbortCSAAssert:
@ -910,11 +910,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
isolate()->builtins()->builtin_handle(Builtins::kAbortCSAAssert),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortCSAAssert");
__ stop();
unwinding_info_writer_.MarkBlockWillExit();
break;
case kArchDebugBreak:
__ stop("kArchDebugBreak");
__ stop();
break;
case kArchComment:
__ RecordComment(reinterpret_cast<const char*>(i.InputInt32(0)));
@ -2932,7 +2932,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
new (gen_->zone()) ReferenceMap(gen_->zone());
gen_->RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromWasmTrap));
__ stop();
}
}
}
@ -3111,7 +3111,7 @@ void CodeGenerator::AssembleConstructFrame() {
ReferenceMap* reference_map = new (zone()) ReferenceMap(zone());
RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromThrow));
__ stop();
}
__ bind(&done);

View File

@ -839,7 +839,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
__ Call(isolate()->builtins()->builtin_handle(Builtins::kAbortJS),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortJS");
__ stop();
break;
case kArchAbortCSAAssert:
DCHECK(i.InputRegister(0) == a0);
@ -855,10 +855,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
isolate()->builtins()->builtin_handle(Builtins::kAbortCSAAssert),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortCSAAssert");
__ stop();
break;
case kArchDebugBreak:
__ stop("kArchDebugBreak");
__ stop();
break;
case kArchComment:
__ RecordComment(reinterpret_cast<const char*>(i.InputInt32(0)));
@ -3184,7 +3184,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
new (gen_->zone()) ReferenceMap(gen_->zone());
gen_->RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromWasmTrap));
__ stop();
}
}
}

View File

@ -817,7 +817,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
__ Call(isolate()->builtins()->builtin_handle(Builtins::kAbortJS),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortJS");
__ stop();
break;
case kArchAbortCSAAssert:
DCHECK(i.InputRegister(0) == a0);
@ -833,10 +833,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
isolate()->builtins()->builtin_handle(Builtins::kAbortCSAAssert),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortCSAAssert");
__ stop();
break;
case kArchDebugBreak:
__ stop("kArchDebugBreak");
__ stop();
break;
case kArchComment:
__ RecordComment(reinterpret_cast<const char*>(i.InputInt64(0)));
@ -3331,7 +3331,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
new (gen_->zone()) ReferenceMap(gen_->zone());
gen_->RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromWasmTrap));
__ stop();
}
}
}

View File

@ -1095,7 +1095,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
__ Call(isolate()->builtins()->builtin_handle(Builtins::kAbortJS),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortJS");
__ stop();
break;
case kArchAbortCSAAssert:
DCHECK(i.InputRegister(0) == r4);
@ -1111,10 +1111,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
isolate()->builtins()->builtin_handle(Builtins::kAbortCSAAssert),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortCSAAssert");
__ stop();
break;
case kArchDebugBreak:
__ stop("kArchDebugBreak");
__ stop();
break;
case kArchNop:
case kArchThrowTerminator:
@ -2189,7 +2189,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
new (gen_->zone()) ReferenceMap(gen_->zone());
gen_->RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromWasmTrap));
__ stop();
}
}
}
@ -2439,7 +2439,7 @@ void CodeGenerator::AssembleConstructFrame() {
ReferenceMap* reference_map = new (zone()) ReferenceMap(zone());
RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromThrow));
__ stop();
}
__ bind(&done);

View File

@ -1570,7 +1570,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
__ Call(isolate()->builtins()->builtin_handle(Builtins::kAbortJS),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortJS");
__ stop();
break;
case kArchAbortCSAAssert:
DCHECK(i.InputRegister(0) == r3);
@ -1586,10 +1586,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
isolate()->builtins()->builtin_handle(Builtins::kAbortCSAAssert),
RelocInfo::CODE_TARGET);
}
__ stop("kArchAbortCSAAssert");
__ stop();
break;
case kArchDebugBreak:
__ stop("kArchDebugBreak");
__ stop();
break;
case kArchNop:
case kArchThrowTerminator:
@ -2918,7 +2918,7 @@ void CodeGenerator::AssembleArchTrap(Instruction* instr,
new (gen_->zone()) ReferenceMap(gen_->zone());
gen_->RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromWasmTrap));
__ stop();
}
}
}
@ -3127,7 +3127,7 @@ void CodeGenerator::AssembleConstructFrame() {
ReferenceMap* reference_map = new (zone()) ReferenceMap(zone());
RecordSafepoint(reference_map, Safepoint::kNoLazyDeopt);
if (FLAG_debug_code) {
__ stop(GetAbortReason(AbortReason::kUnexpectedReturnFromThrow));
__ stop();
}
__ bind(&done);

View File

@ -231,7 +231,7 @@ void Deoptimizer::GenerateDeoptimizationEntries(MacroAssembler* masm,
__ pop(lr);
__ Jump(scratch);
}
__ stop("Unreachable.");
__ stop();
}
bool Deoptimizer::PadTopOfStackRegister() { return false; }

View File

@ -225,7 +225,7 @@ void Deoptimizer::GenerateDeoptimizationEntries(MacroAssembler* masm,
__ pop(at); // Get continuation, leave pc on stack.
__ pop(ra);
__ Jump(at);
__ stop("Unreachable.");
__ stop();
}
// Maximum size of a table entry generated below.

View File

@ -226,7 +226,7 @@ void Deoptimizer::GenerateDeoptimizationEntries(MacroAssembler* masm,
__ pop(at); // Get continuation, leave pc on stack.
__ pop(ra);
__ Jump(at);
__ stop("Unreachable.");
__ stop();
}
// Maximum size of a table entry generated below.

View File

@ -223,7 +223,7 @@ void Deoptimizer::GenerateDeoptimizationEntries(MacroAssembler* masm,
__ pop(r0);
__ mtlr(r0);
__ Jump(ip);
__ stop("Unreachable.");
__ stop();
}
bool Deoptimizer::PadTopOfStackRegister() { return false; }

View File

@ -228,7 +228,7 @@ void Deoptimizer::GenerateDeoptimizationEntries(MacroAssembler* masm,
__ pop(ip); // get continuation, leave pc on stack
__ pop(r14);
__ Jump(ip);
__ stop("Unreachable.");
__ stop();
}
bool Deoptimizer::PadTopOfStackRegister() { return false; }