Mercurial > hg > graal-jvmci-8

changeset 22984:c97ba20ad404

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8072863: Replace fatal() with vm_exit_during_initialization() when an incorrect class is found on the bootclasspath Reviewed-by: dholmes, coleenp Contributed-by: Cheleswer Sahu <cheleswer.sahu@oracle.com>
author dbuck
date Tue, 28 Apr 2015 00:37:33 -0700
parents 1ec24746bb40
children eb8b5cc64669
files src/share/vm/classfile/javaClasses.cpp src/share/vm/prims/whitebox.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp	Thu Apr 23 13:02:32 2015 +0300
+++ b/src/share/vm/classfile/javaClasses.cpp	Tue Apr 28 00:37:33 2015 -0700
@@ -124,7 +124,7 @@
       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: use -XX:+TraceClassLoading to see the origin of the problem class");
   }
   dest_offset = fd.offset();
 }
@@ -3601,7 +3601,7 @@
     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: use -XX:+TraceClassLoading to see the origin of the problem class");
   return -1;
 }
 
--- a/src/share/vm/prims/whitebox.cpp	Thu Apr 23 13:02:32 2015 +0300
+++ b/src/share/vm/prims/whitebox.cpp	Tue Apr 28 00:37:33 2015 -0700
@@ -913,7 +913,7 @@
   if (res == NULL) {
     tty->print_cr("Invalid layout of %s at %s", ik->external_name(),
         name_symbol->as_C_string());
-    fatal("Invalid layout of preloaded class");
+    vm_exit_during_initialization("Invalid layout of preloaded class: use -XX:+TraceClassLoading to see the origin of the problem class");
   }
 
   //fetch the field at the offset we've found