Title: [263074] trunk/Source
- Revision
- 263074
- Author
- [email protected]
- Date
- 2020-06-15 20:03:02 -0700 (Mon, 15 Jun 2020)
Log Message
WTF signal machinery is guarded by #if USE(PTHREADS) && HAVE(MACHINE_CONTEXT) but does not use pthreads or machine context
https://bugs.webkit.org/show_bug.cgi?id=213223
Patch by Michael Catanzaro <[email protected]> on 2020-06-15
Reviewed by Mark Lam.
Source/_javascript_Core:
Use #if OS(UNIX) here too. This should fix stress/ensure-crash.js when
HAVE(MACHINE_CONTEXT) is false.
* jsc.cpp:
(printUsageStatement):
(CommandLine::parseArguments):
Source/WTF:
Use #if OS(UNIX) instead.
* wtf/WTFConfig.h:
* wtf/threads/Signals.cpp:
* wtf/threads/Signals.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (263073 => 263074)
--- trunk/Source/_javascript_Core/ChangeLog 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-06-16 03:03:02 UTC (rev 263074)
@@ -1,3 +1,17 @@
+2020-06-15 Michael Catanzaro <[email protected]>
+
+ WTF signal machinery is guarded by #if USE(PTHREADS) && HAVE(MACHINE_CONTEXT) but does not use pthreads or machine context
+ https://bugs.webkit.org/show_bug.cgi?id=213223
+
+ Reviewed by Mark Lam.
+
+ Use #if OS(UNIX) here too. This should fix stress/ensure-crash.js when
+ HAVE(MACHINE_CONTEXT) is false.
+
+ * jsc.cpp:
+ (printUsageStatement):
+ (CommandLine::parseArguments):
+
2020-06-15 Pavel Feldman <[email protected]>
Web Inspector: introduce request interception
Modified: trunk/Source/_javascript_Core/jsc.cpp (263073 => 263074)
--- trunk/Source/_javascript_Core/jsc.cpp 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/_javascript_Core/jsc.cpp 2020-06-16 03:03:02 UTC (rev 263074)
@@ -2888,7 +2888,7 @@
fprintf(stderr, " -h|--help Prints this help message\n");
fprintf(stderr, " -i Enables interactive mode (default if no files are specified)\n");
fprintf(stderr, " -m Execute as a module\n");
-#if USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#if OS(UNIX)
fprintf(stderr, " -s Installs signal handlers that exit on a crash (Unix platforms only, lldb will not work with this option) \n");
#endif
fprintf(stderr, " -p <file> Outputs profiling data to a file\n");
@@ -2980,7 +2980,7 @@
continue;
}
if (!strcmp(arg, "-s")) {
-#if USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#if OS(UNIX)
SignalAction (*exit)(Signal, SigInfo&, PlatformRegisters&) = [] (Signal, SigInfo&, PlatformRegisters&) {
dataLogLn("Signal handler hit. Exiting with status 0");
_exit(0);
Modified: trunk/Source/WTF/ChangeLog (263073 => 263074)
--- trunk/Source/WTF/ChangeLog 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/WTF/ChangeLog 2020-06-16 03:03:02 UTC (rev 263074)
@@ -1,3 +1,16 @@
+2020-06-15 Michael Catanzaro <[email protected]>
+
+ WTF signal machinery is guarded by #if USE(PTHREADS) && HAVE(MACHINE_CONTEXT) but does not use pthreads or machine context
+ https://bugs.webkit.org/show_bug.cgi?id=213223
+
+ Reviewed by Mark Lam.
+
+ Use #if OS(UNIX) instead.
+
+ * wtf/WTFConfig.h:
+ * wtf/threads/Signals.cpp:
+ * wtf/threads/Signals.h:
+
2020-06-15 Keith Miller <[email protected]>
REGRESSION (r263045): TestWTF.Signals.SignalsWorkOnExit crashing
Modified: trunk/Source/WTF/wtf/WTFConfig.h (263073 => 263074)
--- trunk/Source/WTF/wtf/WTFConfig.h 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/WTF/wtf/WTFConfig.h 2020-06-16 03:03:02 UTC (rev 263074)
@@ -67,7 +67,7 @@
bool isPermanentlyFrozen;
-#if USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#if OS(UNIX)
SignalHandlers signalHandlers;
#endif
PtrTagLookup* ptrTagLookupHead;
Modified: trunk/Source/WTF/wtf/threads/Signals.cpp (263073 => 263074)
--- trunk/Source/WTF/wtf/threads/Signals.cpp 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/WTF/wtf/threads/Signals.cpp 2020-06-16 03:03:02 UTC (rev 263074)
@@ -26,7 +26,7 @@
#include "config.h"
#include <wtf/threads/Signals.h>
-#if USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#if OS(UNIX)
#if HAVE(MACH_EXCEPTIONS)
extern "C" {
@@ -417,4 +417,4 @@
} // namespace WTF
-#endif // USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#endif // OS(UNIX)
Modified: trunk/Source/WTF/wtf/threads/Signals.h (263073 => 263074)
--- trunk/Source/WTF/wtf/threads/Signals.h 2020-06-16 02:17:00 UTC (rev 263073)
+++ trunk/Source/WTF/wtf/threads/Signals.h 2020-06-16 03:03:02 UTC (rev 263074)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#if OS(UNIX)
#include <signal.h>
#include <tuple>
@@ -154,4 +154,4 @@
using WTF::addSignalHandler;
using WTF::activateSignalHandlersFor;
-#endif // USE(PTHREADS) && HAVE(MACHINE_CONTEXT)
+#endif // OS(UNIX)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes