Skip to content

Commit db6fa59

Browse files
shipilevshipilev
committed
8355617: Remove historical debug_only macro in favor of DEBUG_ONLY
Reviewed-by: stefank, kbarrett, jwaters
1 parent 3140de4 commit db6fa59

File tree

119 files changed

+369
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+369
-372
lines changed

‎src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
6969
__ far_call(RuntimeAddress(a));
7070
ce->add_call_info_here(_info);
7171
ce->verify_oop_map(_info);
72-
debug_only(__ should_not_reach_here());
72+
DEBUG_ONLY(__ should_not_reach_here());
7373
return;
7474
}
7575

@@ -90,7 +90,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
9090
__ blr(lr);
9191
ce->add_call_info_here(_info);
9292
ce->verify_oop_map(_info);
93-
debug_only(__ should_not_reach_here());
93+
DEBUG_ONLY(__ should_not_reach_here());
9494
}
9595

9696
PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -103,7 +103,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
103103
__ far_call(RuntimeAddress(a));
104104
ce->add_call_info_here(_info);
105105
ce->verify_oop_map(_info);
106-
debug_only(__ should_not_reach_here());
106+
DEBUG_ONLY(__ should_not_reach_here());
107107
}
108108

109109
void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -274,7 +274,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
274274
__ far_call(RuntimeAddress(a));
275275
ce->add_call_info_here(_info);
276276
ce->verify_oop_map(_info);
277-
debug_only(__ should_not_reach_here());
277+
DEBUG_ONLY(__ should_not_reach_here());
278278
}
279279

280280

@@ -289,7 +289,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
289289
}
290290
__ far_call(RuntimeAddress(Runtime1::entry_for(_stub)), rscratch2);
291291
ce->add_call_info_here(_info);
292-
debug_only(__ should_not_reach_here());
292+
DEBUG_ONLY(__ should_not_reach_here());
293293
}
294294

295295

‎src/hotspot/cpu/arm/arm.ad‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,11 +1238,11 @@ encode %{
12381238
enc_class save_last_PC %{
12391239
// preserve mark
12401240
address mark = __ inst_mark();
1241-
debug_only(int off0 = __ offset());
1241+
DEBUG_ONLY(int off0 = __ offset());
12421242
int ret_addr_offset = as_MachCall()->ret_addr_offset();
12431243
__ adr(LR, mark + ret_addr_offset);
12441244
__ str(LR, Address(Rthread, JavaThread::last_Java_pc_offset()));
1245-
debug_only(int off1 = __ offset());
1245+
DEBUG_ONLY(int off1 = __ offset());
12461246
assert(off1 - off0 == 2 * Assembler::InstructionSize, "correct size prediction");
12471247
// restore mark
12481248
__ set_inst_mark(mark);
@@ -1251,11 +1251,11 @@ encode %{
12511251
enc_class preserve_SP %{
12521252
// preserve mark
12531253
address mark = __ inst_mark();
1254-
debug_only(int off0 = __ offset());
1254+
DEBUG_ONLY(int off0 = __ offset());
12551255
// FP is preserved across all calls, even compiled calls.
12561256
// Use it to preserve SP in places where the callee might change the SP.
12571257
__ mov(Rmh_SP_save, SP);
1258-
debug_only(int off1 = __ offset());
1258+
DEBUG_ONLY(int off1 = __ offset());
12591259
assert(off1 - off0 == 4, "correct size prediction");
12601260
// restore mark
12611261
__ set_inst_mark(mark);

‎src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
5959
__ call(Runtime1::entry_for(C1StubId::predicate_failed_trap_id), relocInfo::runtime_call_type);
6060
ce->add_call_info_here(_info);
6161
ce->verify_oop_map(_info);
62-
debug_only(__ should_not_reach_here());
62+
DEBUG_ONLY(__ should_not_reach_here());
6363
return;
6464
}
6565
// Pass the array index on stack because all registers must be preserved
@@ -91,7 +91,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
9191
__ call(Runtime1::entry_for(C1StubId::predicate_failed_trap_id), relocInfo::runtime_call_type);
9292
ce->add_call_info_here(_info);
9393
ce->verify_oop_map(_info);
94-
debug_only(__ should_not_reach_here());
94+
DEBUG_ONLY(__ should_not_reach_here());
9595
}
9696

9797
void DivByZeroStub::emit_code(LIR_Assembler* ce) {

‎src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void NativeNMethodBarrier::verify() const {
7272
static NativeNMethodBarrier* native_nmethod_barrier(nmethod* nm) {
7373
address barrier_address = nm->code_begin() + nm->frame_complete_offset() - entry_barrier_bytes;
7474
NativeNMethodBarrier* barrier = reinterpret_cast<NativeNMethodBarrier*>(barrier_address);
75-
debug_only(barrier->verify());
75+
DEBUG_ONLY(barrier->verify());
7676
return barrier;
7777
}
7878

‎src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
7474
__ bctrl();
7575
ce->add_call_info_here(_info);
7676
ce->verify_oop_map(_info);
77-
debug_only(__ illtrap());
77+
DEBUG_ONLY(__ illtrap());
7878
return;
7979
}
8080

@@ -98,7 +98,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
9898
__ bctrl();
9999
ce->add_call_info_here(_info);
100100
ce->verify_oop_map(_info);
101-
debug_only(__ illtrap());
101+
DEBUG_ONLY(__ illtrap());
102102
}
103103

104104

@@ -115,7 +115,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
115115
__ bctrl();
116116
ce->add_call_info_here(_info);
117117
ce->verify_oop_map(_info);
118-
debug_only(__ illtrap());
118+
DEBUG_ONLY(__ illtrap());
119119
}
120120

121121

@@ -156,7 +156,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
156156
__ bctrl();
157157
ce->add_call_info_here(_info);
158158
ce->verify_oop_map(_info);
159-
debug_only(__ illtrap());
159+
DEBUG_ONLY(__ illtrap());
160160
}
161161

162162

@@ -179,7 +179,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
179179
__ bctrl();
180180
ce->add_call_info_here(_info);
181181
ce->verify_oop_map(_info);
182-
debug_only(__ illtrap());
182+
DEBUG_ONLY(__ illtrap());
183183
}
184184

185185

@@ -193,7 +193,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
193193
__ mtctr(R0);
194194
__ bctrl();
195195
ce->add_call_info_here(_info);
196-
debug_only( __ illtrap(); )
196+
DEBUG_ONLY( __ illtrap(); )
197197
}
198198

199199

@@ -441,7 +441,7 @@ void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
441441
__ load_const_optimized(R0, _trap_request); // Pass trap request in R0.
442442
__ bctrl();
443443
ce->add_call_info_here(_info);
444-
debug_only(__ illtrap());
444+
DEBUG_ONLY(__ illtrap());
445445
}
446446

447447

‎src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ LIR_Opr FrameMap::_caller_save_fpu_regs[] = {};
189189

190190
FloatRegister FrameMap::nr2floatreg (int rnr) {
191191
assert(_init_done, "tables not initialized");
192-
debug_only(fpu_range_check(rnr);)
192+
DEBUG_ONLY(fpu_range_check(rnr);)
193193
return _fpu_regs[rnr];
194194
}
195195

‎src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static NativeNMethodBarrier* get_nmethod_barrier(nmethod* nm) {
108108
}
109109

110110
auto barrier = reinterpret_cast<NativeNMethodBarrier*>(barrier_address);
111-
debug_only(barrier->verify());
111+
DEBUG_ONLY(barrier->verify());
112112
return barrier;
113113
}
114114

‎src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
7070
__ far_call(RuntimeAddress(a));
7171
ce->add_call_info_here(_info);
7272
ce->verify_oop_map(_info);
73-
debug_only(__ should_not_reach_here());
73+
DEBUG_ONLY(__ should_not_reach_here());
7474
return;
7575
}
7676

@@ -92,7 +92,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
9292
__ rt_call(Runtime1::entry_for(stub_id), ra);
9393
ce->add_call_info_here(_info);
9494
ce->verify_oop_map(_info);
95-
debug_only(__ should_not_reach_here());
95+
DEBUG_ONLY(__ should_not_reach_here());
9696
}
9797

9898
PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -105,7 +105,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
105105
__ far_call(RuntimeAddress(a));
106106
ce->add_call_info_here(_info);
107107
ce->verify_oop_map(_info);
108-
debug_only(__ should_not_reach_here());
108+
DEBUG_ONLY(__ should_not_reach_here());
109109
}
110110

111111
void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -258,7 +258,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
258258
__ far_call(RuntimeAddress(a));
259259
ce->add_call_info_here(_info);
260260
ce->verify_oop_map(_info);
261-
debug_only(__ should_not_reach_here());
261+
DEBUG_ONLY(__ should_not_reach_here());
262262
}
263263

264264
void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
@@ -272,7 +272,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
272272
}
273273
__ far_call(RuntimeAddress(Runtime1::entry_for(_stub)));
274274
ce->add_call_info_here(_info);
275-
debug_only(__ should_not_reach_here());
275+
DEBUG_ONLY(__ should_not_reach_here());
276276
}
277277

278278
void ArrayCopyStub::emit_code(LIR_Assembler* ce) {

‎src/hotspot/cpu/riscv/nativeInst_riscv.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class NativeGeneralJump: public NativeJump {
300300
inline NativeGeneralJump* nativeGeneralJump_at(address addr) {
301301
assert_cond(addr != nullptr);
302302
NativeGeneralJump* jump = (NativeGeneralJump*)(addr);
303-
debug_only(jump->verify();)
303+
DEBUG_ONLY(jump->verify();)
304304
return jump;
305305
}
306306

‎src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
5252
CHECK_BAILOUT();
5353
ce->add_call_info_here(_info);
5454
ce->verify_oop_map(_info);
55-
debug_only(__ should_not_reach_here());
55+
DEBUG_ONLY(__ should_not_reach_here());
5656
return;
5757
}
5858

@@ -74,7 +74,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
7474
CHECK_BAILOUT();
7575
ce->add_call_info_here(_info);
7676
ce->verify_oop_map(_info);
77-
debug_only(__ should_not_reach_here());
77+
DEBUG_ONLY(__ should_not_reach_here());
7878
}
7979

8080
PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -88,7 +88,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
8888
CHECK_BAILOUT();
8989
ce->add_call_info_here(_info);
9090
ce->verify_oop_map(_info);
91-
debug_only(__ should_not_reach_here());
91+
DEBUG_ONLY(__ should_not_reach_here());
9292
}
9393

9494
void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
@@ -116,7 +116,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
116116
ce->emit_call_c(Runtime1::entry_for (C1StubId::throw_div0_exception_id));
117117
CHECK_BAILOUT();
118118
ce->add_call_info_here(_info);
119-
debug_only(__ should_not_reach_here());
119+
DEBUG_ONLY(__ should_not_reach_here());
120120
}
121121

122122
void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
@@ -134,7 +134,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
134134
CHECK_BAILOUT();
135135
ce->add_call_info_here(_info);
136136
ce->verify_oop_map(_info);
137-
debug_only(__ should_not_reach_here());
137+
DEBUG_ONLY(__ should_not_reach_here());
138138
}
139139

140140
// Note: pass object in Z_R1_scratch
@@ -147,7 +147,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
147147
ce->emit_call_c(a);
148148
CHECK_BAILOUT();
149149
ce->add_call_info_here(_info);
150-
debug_only(__ should_not_reach_here());
150+
DEBUG_ONLY(__ should_not_reach_here());
151151
}
152152

153153
NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, C1StubId stub_id) {

0 commit comments

Comments
 (0)