Changeset 217611 in webkit for trunk/Source/JavaScriptCore/runtime/VMTraps.cpp

Timestamp:

May 31, 2017, 11:16:53 AM (8 years ago)

Author:

[email protected]

Message:

Reland r216808, underlying lldb bug has been fixed.
​https://bugs.webkit.org/show_bug.cgi?id=172759

Source/JavaScriptCore:

Unreviewed, relanding old patch. See: rdar://problem/31183352

• API/tests/ExecutionTimeLimitTest.cpp:

(dispatchTermitateCallback):
(testExecutionTimeLimit):

• runtime/JSLock.cpp:

(JSC::JSLock::didAcquireLock):

• runtime/Options.cpp:

(JSC::overrideDefaults):
(JSC::Options::initialize):

• runtime/Options.h:
• runtime/VMTraps.cpp:

(JSC::SignalContext::SignalContext):
(JSC::SignalContext::adjustPCToPointToTrappingInstruction):
(JSC::installSignalHandler):
(JSC::VMTraps::SignalSender::send):

• tools/SigillCrashAnalyzer.cpp:

(JSC::SignalContext::SignalContext):
(JSC::SignalContext::dump):
(JSC::installCrashHandler):

• wasm/WasmBBQPlan.cpp:

(JSC::Wasm::BBQPlan::compileFunctions):

• wasm/WasmFaultSignalHandler.cpp:

(JSC::Wasm::trapHandler):
(JSC::Wasm::enableFastMemory):

• wasm/WasmMachineThreads.cpp:

(JSC::Wasm::resetInstructionCacheOnAllThreads):

Source/WTF:

Unreviewed, relanding old patch. See: rdar://problem/31183352

• Configurations/WTF.xcconfig:
• WTF.xcodeproj/project.pbxproj:
• wtf/Platform.h:
• wtf/PlatformRegisters.h:

(WTF::registersFromUContext):

• wtf/StackBounds.h:

(WTF::StackBounds::StackBounds):

• wtf/ThreadHolder.cpp:

(WTF::ThreadHolder::~ThreadHolder):

• wtf/ThreadMessage.cpp:

(WTF::sendMessageUsingSignal):
(WTF::sendMessageUsingMach):
(WTF::deliverMessagesUsingMach):
(WTF::sendMessageScoped):

• wtf/ThreadMessage.h:

(WTF::sendMessage):

• wtf/Threading.h:

(WTF::Thread::machThread):

• wtf/mac/MachExceptions.defs: Copied from Source/WTF/wtf/ThreadMessage.h.
• wtf/threads/Signals.cpp:

(WTF::startMachExceptionHandlerThread):
(WTF::fromMachException):
(WTF::toMachMask):
(WTF::handleSignalsWithMach):
(WTF::setExceptionPorts):
(WTF::activeThreads):
(WTF::registerThreadForMachExceptionHandling):
(WTF::unregisterThreadForMachExceptionHandling):
(WTF::installSignalHandler):
(WTF::jscSignalHandler):

• wtf/threads/Signals.h:

Tools:

Unreviewed, relanding old patch. See: rdar://problem/31183352

• TestWebKitAPI/Tests/WTF/ThreadMessages.cpp:

(runThreadMessageTest):
(TEST):

File:

• trunk/Source/JavaScriptCore/runtime/VMTraps.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/VMTraps.cpp

@@ -54 +54 @@
 
 struct SignalContext {
-    SignalContext(mcontext_t& mcontext)
-        : mcontext(mcontext)
-        , trapPC(MachineContext::instructionPointer(mcontext))
-        , stackPointer(MachineContext::stackPointer(mcontext))
-        , framePointer(MachineContext::framePointer(mcontext))
+    SignalContext(PlatformRegisters& registers)
+        : registers(registers)
+        , trapPC(MachineContext::instructionPointer(registers))
+        , stackPointer(MachineContext::stackPointer(registers))
+        , framePointer(MachineContext::framePointer(registers))
     {
 #if CPU(X86_64) || CPU(X86)
@@ -69 +69 @@
     {
 #if CPU(X86_64) || CPU(X86)
-        MachineContext::instructionPointer(mcontext) = trapPC;
-#endif
-    }
-
-    mcontext_t& mcontext;
+        MachineContext::instructionPointer(registers) = trapPC;
+#endif
+    }
+
+    PlatformRegisters& registers;
     void* trapPC;
     void* stackPointer;
@@ -131 +131 @@
 static void installSignalHandler()
 {
-    installSignalHandler(Signal::Trap, [] (int, siginfo_t*, void* uap) -> SignalAction {
-        SignalContext context(static_cast<ucontext_t*>(uap)->uc_mcontext);
+    installSignalHandler(Signal::Trap, [] (Signal, SigInfo&, PlatformRegisters& registers) -> SignalAction {
+        SignalContext context(registers);
 
         if (!isJITPC(context.trapPC))
@@ -405 +405 @@
             auto optionalOwnerThread = vm.ownerThread();
             if (optionalOwnerThread) {
-                sendMessage(*optionalOwnerThread.value().get(), [] (siginfo_t*, ucontext_t* ucontext) -> void {
-                    SignalContext context(ucontext->uc_mcontext);
+                sendMessage(*optionalOwnerThread.value().get(), [] (PlatformRegisters& registers) -> void {
+                    SignalContext context(registers);
                     auto activeVMAndStackBounds = findActiveVMAndStackBounds(context);
                     if (activeVMAndStackBounds) {