Changeset 217638 in webkit for trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp

Timestamp:

May 31, 2017, 4:25:04 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r217611 and r217631.
​https://bugs.webkit.org/show_bug.cgi?id=172785

"caused wasm-hashset-many.html to become flaky." (Requested by
keith_miller on #webkit).

Reverted changesets:

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

"Use dispatch queues for mach exceptions"
​https://bugs.webkit.org/show_bug.cgi?id=172775
​http://trac.webkit.org/changeset/217631

File:

• trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/tools/SigillCrashAnalyzer.cpp

@@ -79 +79 @@
 
 struct SignalContext {
-    SignalContext(PlatformRegisters& registers)
-        : registers(registers)
-        , machinePC(MachineContext::instructionPointer(registers))
-        , stackPointer(MachineContext::stackPointer(registers))
-        , framePointer(MachineContext::framePointer(registers))
+    SignalContext(mcontext_t& mcontext)
+        : mcontext(mcontext)
+        , machinePC(MachineContext::instructionPointer(mcontext))
+        , stackPointer(MachineContext::stackPointer(mcontext))
+        , framePointer(MachineContext::framePointer(mcontext))
     { }
 
@@ -113 +113 @@
 
 #define DUMP_REGISTER(__reg) \
-        log("Register " #__reg ": %p", reinterpret_cast<void*>(registers.__##__reg));
+        log("Register " #__reg ": %p", reinterpret_cast<void*>(mcontext->__ss.__##__reg));
         FOR_EACH_REGISTER(DUMP_REGISTER)
 #undef FOR_EACH_REGISTER
@@ -121 +121 @@
         for (i = 0; i < 28; i += 4) {
             log("x%d: %016llx x%d: %016llx x%d: %016llx x%d: %016llx",
-                i, registers.__x[i],
-                i+1, registers.__x[i+1],
-                i+2, registers.__x[i+2],
-                i+3, registers.__x[i+3]);
+                i, mcontext->__ss.__x[i],
+                i+1, mcontext->__ss.__x[i+1],
+                i+2, mcontext->__ss.__x[i+2],
+                i+3, mcontext->__ss.__x[i+3]);
         }
         ASSERT(i < 29);
         log("x%d: %016llx fp: %016llx lr: %016llx",
-            i, registers.__x[i], registers.__fp, registers.__lr);
+            i, mcontext->__ss.__x[i], mcontext->__ss.__fp, mcontext->__ss.__lr);
         log("sp: %016llx pc: %016llx cpsr: %08x",
-            registers.__sp, registers.__pc, registers.__cpsr);
+            mcontext->__ss.__sp, mcontext->__ss.__pc, mcontext->__ss.__cpsr);
 #endif
     }
 
-    PlatformRegisters& registers;
+    mcontext_t& mcontext;
     void* machinePC;
     void* stackPointer;
@@ -143 +143 @@
 {
 #if CPU(X86_64) || CPU(ARM64)
-    installSignalHandler(Signal::Ill, [] (Signal, SigInfo&, PlatformRegisters& registers) {
-        SignalContext context(registers);
+    installSignalHandler(Signal::Ill, [] (int, siginfo_t*, void* uap) {
+        SignalContext context(static_cast<ucontext_t*>(uap)->uc_mcontext);
 
         if (!isJITPC(context.machinePC))