8377799: [lworld] Diagnostic PrintFlatArrayLayout flag has no effect in product builds

robcasloz · Arraying · commit adf92f09c735 · 2026-02-16T12:26:35.000Z
Reviewed-by: phubner
diff --git a/src/hotspot/share/oops/flatArrayKlass.cpp b/src/hotspot/share/oops/flatArrayKlass.cpp
@@ -92,11 +92,9 @@ FlatArrayKlass::FlatArrayKlass(Klass* element_klass, Symbol* name, ArrayProperti
   }
 #endif // ASSERT
 
-#ifndef PRODUCT
   if (PrintFlatArrayLayout) {
     print();
   }
-#endif
 }
 
 FlatArrayKlass* FlatArrayKlass::allocate_klass(Klass* eklass, ArrayProperties props, LayoutKind lk, TRAPS) {
@@ -383,7 +381,6 @@ u2 FlatArrayKlass::compute_modifier_flags() const {
 }
 
 void FlatArrayKlass::print_on(outputStream* st) const {
-#ifndef PRODUCT
   assert(!is_refArray_klass(), "Unimplemented");
   ResourceMark rm;
 
@@ -404,7 +401,6 @@ void FlatArrayKlass::print_on(outputStream* st) const {
   st->print(" - element size %i ", elem_size);
   st->print("aligned layout size %i", 1 << layout_helper_log2_element_size(layout_helper()));
   st->cr();
-#endif //PRODUCT
 }
 
 void FlatArrayKlass::print_value_on(outputStream* st) const {

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,9 @@ FlatArrayKlass::FlatArrayKlass(Klass* element_klass, Symbol* name, ArrayProperti`
`92`	`92`	`}`
`93`	`93`	`#endif // ASSERT`
`94`	`94`
`95`		`-#ifndef PRODUCT`
`96`	`95`	`if (PrintFlatArrayLayout) {`
`97`	`96`	`print();`
`98`	`97`	`}`
`99`		`-#endif`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`FlatArrayKlass* FlatArrayKlass::allocate_klass(Klass* eklass, ArrayProperties props, LayoutKind lk, TRAPS) {`
`@@ -383,7 +381,6 @@ u2 FlatArrayKlass::compute_modifier_flags() const {`
`383`	`381`	`}`
`384`	`382`
`385`	`383`	`void FlatArrayKlass::print_on(outputStream* st) const {`
`386`		`-#ifndef PRODUCT`
`387`	`384`	`assert(!is_refArray_klass(), "Unimplemented");`
`388`	`385`	`ResourceMark rm;`
`389`	`386`
`@@ -404,7 +401,6 @@ void FlatArrayKlass::print_on(outputStream* st) const {`
`404`	`401`	`st->print(" - element size %i ", elem_size);`
`405`	`402`	`st->print("aligned layout size %i", 1 << layout_helper_log2_element_size(layout_helper()));`
`406`	`403`	`st->cr();`
`407`		`-#endif //PRODUCT`
`408`	`404`	`}`
`409`	`405`
`410`	`406`	`void FlatArrayKlass::print_value_on(outputStream* st) const {`