From 837757c984cba843ddfd23db9215b8d178d8f42d Mon Sep 17 00:00:00 2001 From: MBaesken Date: Wed, 22 May 2024 16:27:23 +0200 Subject: [PATCH 1/2] JDK-8332720 --- src/hotspot/share/oops/instanceKlass.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index 3b3a4ac10a662..83fe3dd2ec876 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -3547,7 +3547,9 @@ void InstanceKlass::print_on(outputStream* st) const { } } st->print(BULLET"method ordering: "); method_ordering()->print_value_on(st); st->cr(); - st->print(BULLET"default_methods: "); default_methods()->print_value_on(st); st->cr(); + st->print(BULLET"default_methods: "); + if (default_methods() != nullptr) { default_methods()->print_value_on(st); } + st->cr(); if (Verbose && default_methods() != nullptr) { Array* method_array = default_methods(); for (int i = 0; i < method_array->length(); i++) { From 56b0907b1e893dfed74f39b9a4c39b4fa5300c4c Mon Sep 17 00:00:00 2001 From: MBaesken Date: Thu, 23 May 2024 09:45:43 +0200 Subject: [PATCH 2/2] adjust check --- src/hotspot/share/oops/instanceKlass.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index 83fe3dd2ec876..dcc3836039958 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -3547,13 +3547,13 @@ void InstanceKlass::print_on(outputStream* st) const { } } st->print(BULLET"method ordering: "); method_ordering()->print_value_on(st); st->cr(); - st->print(BULLET"default_methods: "); - if (default_methods() != nullptr) { default_methods()->print_value_on(st); } - st->cr(); - if (Verbose && default_methods() != nullptr) { - Array* method_array = default_methods(); - for (int i = 0; i < method_array->length(); i++) { - st->print("%d : ", i); method_array->at(i)->print_value(); st->cr(); + if (default_methods() != nullptr) { + st->print(BULLET"default_methods: "); default_methods()->print_value_on(st); st->cr(); + if (Verbose) { + Array* method_array = default_methods(); + for (int i = 0; i < method_array->length(); i++) { + st->print("%d : ", i); method_array->at(i)->print_value(); st->cr(); + } } } if (default_vtable_indices() != nullptr) {