8341020: Error handler crashes when Metaspace is not fully initialized

shipilev · shipilev · commit 7f4ed5001efa · 2024-10-18T05:55:07.000Z
Reviewed-by: kbarrett, jsjolen, stefank, dholmes
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
@@ -1290,7 +1290,7 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
   }
 
   // Check if in metaspace and print types that have vptrs
-  if (Metaspace::contains(addr)) {
+  if (Metaspace::initialized() && Metaspace::contains(addr)) {
     if (Klass::is_valid((Klass*)addr)) {
       st->print_cr(INTPTR_FORMAT " is a pointer to class: ", p2i(addr));
       ((Klass*)addr)->print_on(st);

Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,7 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {`
`1290`	`1290`	`}`
`1291`	`1291`
`1292`	`1292`	`// Check if in metaspace and print types that have vptrs`
`1293`		`- if (Metaspace::contains(addr)) {`
	`1293`	`+ if (Metaspace::initialized() && Metaspace::contains(addr)) {`
`1294`	`1294`	`if (Klass::is_valid((Klass*)addr)) {`
`1295`	`1295`	`st->print_cr(INTPTR_FORMAT " is a pointer to class: ", p2i(addr));`
`1296`	`1296`	`((Klass*)addr)->print_on(st);`