From 98c2737c8ec51d40c96dcff921e447de2590bf9e Mon Sep 17 00:00:00 2001
From: hseigel <unknown>
Date: Wed, 5 Jun 2013 14:12:49 -0400
Subject: [PATCH] 8009302: Mac OS X: JVM crash on infinite recursion on Appkit
 Thread Summary: Use SA_ONSTACK flag to ensure signal gets delivered properly.
 Reviewed-by: dholmes, coleenp Contributed-by: gerard.ziemski@oracle.com

---
 src/os/bsd/vm/os_bsd.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/os/bsd/vm/os_bsd.cpp b/src/os/bsd/vm/os_bsd.cpp
index f0b32196f..5dd7ce7e4 100644
--- a/src/os/bsd/vm/os_bsd.cpp
+++ b/src/os/bsd/vm/os_bsd.cpp
@@ -3030,6 +3030,19 @@ void os::Bsd::set_signal_handler(int sig, bool set_installed) {
     sigAct.sa_sigaction = signalHandler;
     sigAct.sa_flags = SA_SIGINFO|SA_RESTART;
   }
+#if __APPLE__
+  // Needed for main thread as XNU (Mac OS X kernel) will only deliver SIGSEGV
+  // (which starts as SIGBUS) on main thread with faulting address inside "stack+guard pages"
+  // if the signal handler declares it will handle it on alternate stack.
+  // Notice we only declare we will handle it on alt stack, but we are not
+  // actually going to use real alt stack - this is just a workaround.
+  // Please see ux_exception.c, method catch_mach_exception_raise for details
+  // link http://www.opensource.apple.com/source/xnu/xnu-2050.18.24/bsd/uxkern/ux_exception.c
+  if (sig == SIGSEGV) {
+    sigAct.sa_flags |= SA_ONSTACK;
+  }
+#endif
+
   // Save flags, which are set by ours
   assert(sig > 0 && sig < MAXSIGNUM, "vm signal out of expected range");
   sigflags[sig] = sigAct.sa_flags;
-- 
GitLab