Changeset 214393 in webkit

Timestamp:

Mar 24, 2017 10:34:02 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
​https://bugs.webkit.org/show_bug.cgi?id=170086
<rdar://problem/31253673>

Reviewed by Saam Barati.

Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
just before we RELEASE_ASSERT_NOT_REACHED.

• heap/Heap.cpp:

(JSC::Heap::resumeThePeriphery):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-03-24  Mark Lam  <mark.lam@apple.com>
+
+        Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
+        https://bugs.webkit.org/show_bug.cgi?id=170086
+        <rdar://problem/31253673>
+
+        Reviewed by Saam Barati.
+
+        Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
+        just before we RELEASE_ASSERT_NOT_REACHED.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::resumeThePeriphery):
+
 2017-03-24  JF Bastien  <jfbastien@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -1500 +1500 @@
     if (!m_collectorBelievesThatTheWorldIsStopped) {
         dataLog("Fatal: collector does not believe that the world is stopped.\n");
+#if OS(DARWIN)
+        // FIXME: Remove this when no longer needed.
+        // https://bugs.webkit.org/show_bug.cgi?id=170094
+#if CPU(X86_64)
+        unsigned worldState = m_worldState.load();
+        asm volatile(
+            "int3"
+            :
+            : "a"(m_currentPhase), "b"(m_nextPhase), "c"(worldState), "S"(m_lastServedTicket), "D"(m_lastGrantedTicket)
+            : "memory");
+#elif CPU(ARM64)
+        unsigned worldState = m_worldState.load();
+        asm volatile(
+            "ldrb w0, %0\n"
+            "ldrb w1, %1\n"
+            "ldr w2, %2\n"
+            "ldr x3, %3\n"
+            "ldr x4, %4\n"
+            "brk #0"
+            :
+            : "m"(m_currentPhase), "m"(m_nextPhase), "m"(worldState), "m"(m_lastServedTicket), "m"(m_lastGrantedTicket)
+            : "memory");
+#endif
+#endif // OS(DARWIN)
         RELEASE_ASSERT_NOT_REACHED();
     }