src/share/vm/classfile/javaClasses.cpp

@@ -124,11 +124,11 @@
     tty->print_cr("all fields:");
     for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) {
       tty->print_cr("  name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int());
     }
 #endif //PRODUCT
-    fatal("Invalid layout of preloaded class");
+    vm_exit_during_initialization("Invalid layout of preloaded class");
   }
   dest_offset = fd.offset();
 }
 
 // Same as above but for "optional" offsets that might not be present in certain JDK versions

@@ -3604,11 +3604,11 @@
   tty->print_cr("all fields:");
   for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) {
     tty->print_cr("  name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int());
   }
 #endif //PRODUCT
-  fatal("Invalid layout of preloaded class");
+  vm_exit_during_initialization("Invalid layout of preloaded class");
   return -1;
 }
 
 void javaClasses_init() {
   JavaClasses::compute_offsets();