archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8072863: Replace fatal() with vm_exit_during_initialization() when an incorrect class is found on the bootclasspath

Browse source 
Reviewed-by: dholmes, coleenp
This commit is contained in:
Cheleswer Sahu 2015-04-13 23:04:02 -07:00 • committed by David Buck
parent 74a8303c24
commit f93a647092
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/classfile/javaClasses.cpp
View file

@ -126,7 +126,7 @@ compute_offset(int &dest_offset,
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();
}
@ -3626,7 +3626,7 @@ int InjectedField::compute_offset() {
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;
}

2
hotspot/src/share/vm/prims/whitebox.cpp
View file

@ -1234,7 +1234,7 @@ int WhiteBox::offset_for_field(const char* field_name, oop object,
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