8344352: 32-bit builds crash after JDK-8305895
Reviewed-by: rkennke, coleenp
This commit is contained in:
parent
e9e4200a6a
commit
2649406323
@ -3678,7 +3678,6 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
|
||||
if (UseCompactObjectHeaders && !UseCompressedClassPointers) {
|
||||
FLAG_SET_DEFAULT(UseCompressedClassPointers, true);
|
||||
}
|
||||
ObjLayout::initialize();
|
||||
#endif
|
||||
|
||||
return JNI_OK;
|
||||
|
@ -497,6 +497,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
|
||||
// Timing (must come after argument parsing)
|
||||
TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime));
|
||||
|
||||
// Initialize object layout after parsing the args
|
||||
ObjLayout::initialize();
|
||||
|
||||
// Initialize the os module after parsing the args
|
||||
jint os_init_2_result = os::init_2();
|
||||
if (os_init_2_result != JNI_OK) return os_init_2_result;
|
||||
|
Loading…
Reference in New Issue
Block a user