src/hotspot/share/utilities/vmError.cpp
changeset 55653 3243c42d737d
parent 55652 2d1acda7555a
child 57699 4aea554692aa
--- a/src/hotspot/share/utilities/vmError.cpp	Thu Jul 11 06:49:49 2019 +0200
+++ b/src/hotspot/share/utilities/vmError.cpp	Thu Jul 11 06:56:51 2019 +0200
@@ -1327,6 +1327,12 @@
   // File descriptor to the error log file.
   static int fd_log = -1;
 
+#ifdef CAN_SHOW_REGISTERS_ON_ASSERT
+  // Disarm assertion poison page, since from this point on we do not need this mechanism anymore and it may
+  // cause problems in error handling during native OOM, see JDK-8227275.
+  disarm_assert_poison();
+#endif
+
   // Use local fdStream objects only. Do not use global instances whose initialization
   // relies on dynamic initialization (see JDK-8214975). Do not rely on these instances
   // to carry over into recursions or invocations from other threads.