changeset 53299:0b2574a2a6c7

8216982: Assertion poison page established too early Reviewed-by: mdoerr, dholmes
author stuefe
date Tue, 15 Jan 2019 08:03:30 +0100
parents bd9043ffaa2a
children 54aa3ea04fe8
files src/hotspot/share/runtime/thread.cpp
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/runtime/thread.cpp	Tue Jan 15 11:21:00 2019 +0800
+++ b/src/hotspot/share/runtime/thread.cpp	Tue Jan 15 08:03:30 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3716,6 +3716,10 @@
   // Timing (must come after argument parsing)
   TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime));
 
+  // 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;
+
 #ifdef CAN_SHOW_REGISTERS_ON_ASSERT
   // Initialize assert poison page mechanism.
   if (ShowRegistersOnAssert) {
@@ -3723,10 +3727,6 @@
   }
 #endif // CAN_SHOW_REGISTERS_ON_ASSERT
 
-  // 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;
-
   SafepointMechanism::initialize();
 
   jint adjust_after_os_result = Arguments::adjust_after_os();