Skip to content

Commit 2649406

Browse files
committed
8344352: 32-bit builds crash after JDK-8305895
Reviewed-by: rkennke, coleenp
1 parent e9e4200 commit 2649406

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/hotspot/share/runtime/arguments.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3678,7 +3678,6 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
36783678
if (UseCompactObjectHeaders && !UseCompressedClassPointers) {
36793679
FLAG_SET_DEFAULT(UseCompressedClassPointers, true);
36803680
}
3681-
ObjLayout::initialize();
36823681
#endif
36833682

36843683
return JNI_OK;

src/hotspot/share/runtime/threads.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
497497
// Timing (must come after argument parsing)
498498
TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime));
499499

500+
// Initialize object layout after parsing the args
501+
ObjLayout::initialize();
502+
500503
// Initialize the os module after parsing the args
501504
jint os_init_2_result = os::init_2();
502505
if (os_init_2_result != JNI_OK) return os_init_2_result;

0 commit comments

Comments
 (0)