libllvmForJSC shouldn't call exit(1) on report_fatal_error()

https://bugs.webkit.org/show_bug.cgi?id=122905
<rdar://problem/15237856>

Source/JavaScriptCore:

Reviewed by Michael Saboff.

Expose the new LLVMInstallFatalErrorHandler() API through the soft linking magic and
then always call it to install something that calls CRASH().

* llvm/InitializeLLVM.cpp:
(JSC::llvmCrash):
(JSC::initializeLLVMOnce):
(JSC::initializeLLVM):
* llvm/LLVMAPIFunctions.h:

WebKitLibraries:

Reviewed by Michael Saboff.

* LLVMIncludesMountainLion.tar.bz2:
* LLVMLibrariesMountainLion.tar.bz2:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157558 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 40b5aaa5928034f1623ea2d0f41535cf79332619..3698b61214066ed1d38a8b6a0b85ab67728a4a5b 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-10-16  Filip Pizlo  <fpizlo@apple.com>
+
+        libllvmForJSC shouldn't call exit(1) on report_fatal_error()
+        https://bugs.webkit.org/show_bug.cgi?id=122905
+        <rdar://problem/15237856>
+
+        Reviewed by Michael Saboff.
+        
+        Expose the new LLVMInstallFatalErrorHandler() API through the soft linking magic and
+        then always call it to install something that calls CRASH().
+
+        * llvm/InitializeLLVM.cpp:
+        (JSC::llvmCrash):
+        (JSC::initializeLLVMOnce):
+        (JSC::initializeLLVM):
+        * llvm/LLVMAPIFunctions.h:
+
 2013-10-16  Filip Pizlo  <fpizlo@apple.com>
 
         Prototype chain repatching in the polymorphic case fails to check if the receiver is a dictionary

diff --git a/Source/JavaScriptCore/llvm/InitializeLLVM.cpp b/Source/JavaScriptCore/llvm/InitializeLLVM.cpp
index b0c515f99b0afb8264a20c22f869316d52323105..cbfadb8332eb42d0bbe20005779beb1ed14a85e7 100644 (file)
--- a/Source/JavaScriptCore/llvm/InitializeLLVM.cpp
+++ b/Source/JavaScriptCore/llvm/InitializeLLVM.cpp
@@ -28,15 +28,29 @@
 
 #if HAVE(LLVM)
 
+#include "LLVMAPI.h"
 #include <pthread.h>
 
 namespace JSC {
 
 static pthread_once_t initializeLLVMOnceKey = PTHREAD_ONCE_INIT;
 
+static NO_RETURN_DUE_TO_CRASH void llvmCrash(const char* reason)
+{
+    WTFLogAlways("LLVM failure: %s", reason);
+    CRASH();
+}
+
+static void initializeLLVMOnce()
+{
+    initializeLLVMImpl();
+    
+    llvm->InstallFatalErrorHandler(llvmCrash);
+}
+
 void initializeLLVM()
 {
-    pthread_once(&initializeLLVMOnceKey, initializeLLVMImpl);
+    pthread_once(&initializeLLVMOnceKey, initializeLLVMOnce);
 }
 
 } // namespace JSC

diff --git a/Source/JavaScriptCore/llvm/LLVMAPIFunctions.h b/Source/JavaScriptCore/llvm/LLVMAPIFunctions.h
index 448239b4f664c119a952ff1e78d10f33cb06b0b4..bc44b7a252b12224644dbb22f511b27205c3f833 100644 (file)
--- a/Source/JavaScriptCore/llvm/LLVMAPIFunctions.h
+++ b/Source/JavaScriptCore/llvm/LLVMAPIFunctions.h
@@ -33,6 +33,7 @@
     macro(void, Shutdown, ()) \
     macro(char *, CreateMessage, (const char *Message)) \
     macro(void, DisposeMessage, (char *Message)) \
+    macro(void, InstallFatalErrorHandler, (LLVMFatalErrorHandler Handler)) \
     macro(LLVMContextRef, ContextCreate, (void)) \
     macro(LLVMContextRef, GetGlobalContext, (void)) \
     macro(void, ContextDispose, (LLVMContextRef C)) \

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index dabd27edb037b09e44b0f557bd8ea4310cee0e88..86d8d845b742e3c4da4811e8e8a60c9467e35965 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2013-10-16  Filip Pizlo  <fpizlo@apple.com>
+
+        libllvmForJSC shouldn't call exit(1) on report_fatal_error()
+        https://bugs.webkit.org/show_bug.cgi?id=122905
+        <rdar://problem/15237856>
+
+        Reviewed by Michael Saboff.
+
+        * LLVMIncludesMountainLion.tar.bz2:
+        * LLVMLibrariesMountainLion.tar.bz2:
+
 2013-10-10  Filip Pizlo  <fpizlo@apple.com>
 
         Update the binary drops to the latest version of LLVM, built without -fvisibility=hidden

diff --git a/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 b/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2
index 4cbfb16266ef1b707259792ba1c384a05f41c809..5d4f08850bb9dee33433b3a89660034e21754e1b 100644 (file)
Binary files a/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 and b/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 differ

diff --git a/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 b/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2
index 3505fdcf58590dc0dd98c6951ff02da8dcfc51b7..e930ab6f818bba055c21ed595eb622a1320d97cd 100644 (file)
Binary files a/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 and b/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 differ