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

Timestamp:

May 13, 2017, 1:32:59 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r216808.
​https://bugs.webkit.org/show_bug.cgi?id=172075

caused lldb to hang when debugging (Requested by smfr on
#webkit).

Reverted changeset:

"Use Mach exceptions instead of signals where possible"
​https://bugs.webkit.org/show_bug.cgi?id=171865
​http://trac.webkit.org/changeset/216808

File:

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

trunk/Source/JavaScriptCore/runtime/VMTraps.cpp

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