8295469: S390X: Optimized builds are broken

shipilev · shipilev · commit 0f76adecfbbb · 2022-11-08T09:48:44.000Z
Backport-of: 7b2e83b3955c034208325ea5477afd3c5e1da41a
diff --git a/src/hotspot/cpu/s390/assembler_s390.cpp b/src/hotspot/cpu/s390/assembler_s390.cpp
@@ -138,7 +138,7 @@ Assembler::branch_condition Assembler::inverse_float_condition(Assembler::branch
   return inverse_cc;
 }
 
-#ifdef ASSERT
+#ifndef PRODUCT
 void Assembler::print_dbg_msg(outputStream* out, unsigned long inst, const char* msg, int ilen) {
   out->flush();
   switch (ilen) {
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp
@@ -166,7 +166,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   // Accessors to the template interpreter state.
 
-  void asm_assert_ijava_state_magic(Register tmp) PRODUCT_RETURN;
+  void asm_assert_ijava_state_magic(Register tmp) NOT_DEBUG_RETURN;
 
   void save_bcp();
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ Assembler::branch_condition Assembler::inverse_float_condition(Assembler::branch`
`138`	`138`	`return inverse_cc;`
`139`	`139`	`}`
`140`	`140`
`141`		`-#ifdef ASSERT`
	`141`	`+#ifndef PRODUCT`
`142`	`142`	`void Assembler::print_dbg_msg(outputStream* out, unsigned long inst, const char* msg, int ilen) {`
`143`	`143`	`out->flush();`
`144`	`144`	`switch (ilen) {`