<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Paranoia. I couldn’t figure out which change set could cause a Unix bot to fail, so I quickly tested the revert.<div class="">Re-committed.</div><div class=""><br class=""></div><div class="">-Gerolf</div><div class=""><br class=""></div><div class=""><div><blockquote type="cite" class=""><div class="">On May 24, 2016, at 11:09 PM, David Majnemer <<a href="mailto:david.majnemer@gmail.com" class="">david.majnemer@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Hmm, why did this have to get reverted?</div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Tue, May 24, 2016 at 10:51 PM, Gerolf Hoflehner via llvm-commits <span dir="ltr" class=""><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ghoflehner<br class="">
Date: Wed May 25 00:51:05 2016<br class="">
New Revision: 270670<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=270670&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=270670&view=rev</a><br class="">
Log:<br class="">
[Support] revert previous commit r270643<br class="">
<br class="">
Modified:<br class="">
llvm/trunk/lib/Support/Unix/Signals.inc<br class="">
<br class="">
Modified: llvm/trunk/lib/Support/Unix/Signals.inc<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Signals.inc?rev=270670&r1=270669&r2=270670&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Signals.inc?rev=270670&r1=270669&r2=270670&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/lib/Support/Unix/Signals.inc (original)<br class="">
+++ llvm/trunk/lib/Support/Unix/Signals.inc Wed May 25 00:51:05 2016<br class="">
@@ -490,3 +490,42 @@ void llvm::sys::PrintStackTraceOnErrorSi<br class="">
}<br class="">
#endif<br class="">
}<br class="">
+<br class="">
+<br class="">
+/***/<br class="">
+<br class="">
+// On Darwin, raise sends a signal to the main thread instead of the current<br class="">
+// thread. This has the unfortunate effect that assert() and abort() will end up<br class="">
+// bypassing our crash recovery attempts. We work around this for anything in<br class="">
+// the same linkage unit by just defining our own versions of the assert handler<br class="">
+// and abort.<br class="">
+<br class="">
+#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES)<br class="">
+<br class="">
+#include <signal.h><br class="">
+#include <pthread.h><br class="">
+<br class="">
+int raise(int sig) {<br class="">
+ return pthread_kill(pthread_self(), sig);<br class="">
+}<br class="">
+<br class="">
+void __assert_rtn(const char *func,<br class="">
+ const char *file,<br class="">
+ int line,<br class="">
+ const char *expr) {<br class="">
+ if (func)<br class="">
+ fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %d.\n",<br class="">
+ expr, func, file, line);<br class="">
+ else<br class="">
+ fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n",<br class="">
+ expr, file, line);<br class="">
+ abort();<br class="">
+}<br class="">
+<br class="">
+void abort() {<br class="">
+ raise(SIGABRT);<br class="">
+ usleep(1000);<br class="">
+ __builtin_trap();<br class="">
+}<br class="">
+<br class="">
+#endif<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></div></body></html>