[patch] better unaligned stack checking

icedtea-align-check.patch (text/plain), 1.11 KB, created by Maciej S. Szmigiero on 2018-03-05 17:57:47 UTC

--- a/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2017-10-30 18:28:38.000000000 +0100
+++ b/openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2018-03-04 19:04:08.461427755 +0100
@@ -876,13 +876,12 @@
 #endif // !AMD64
 }
 
-#ifndef PRODUCT
 void os::verify_stack_alignment() {
-#ifdef AMD64
-  assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
-#endif
+  bool align = ((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0;
+  assert(align, "incorrect stack alignment");
+  if (!align)
+    *(volatile int *)(0xbad574cc);
 }
-#endif
 
 
 /*
--- a/openjdk/hotspot/src/share/vm/runtime/os.hpp	2017-10-30 18:28:38.000000000 +0100
+++ b/openjdk/hotspot/src/share/vm/runtime/os.hpp	2018-03-04 18:14:18.966172056 +0100
@@ -496,7 +496,7 @@
   static address current_stack_base();
   static size_t current_stack_size();
 
-  static void verify_stack_alignment() PRODUCT_RETURN;
+  static void verify_stack_alignment();
 
   static int message_box(const char* title, const char* message);
   static char* do_you_want_to_debug(const char* message);