Revert instrumentation from https://bugs.webkit.org/show_bug.cgi?id=170086 that is...
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Apr 2017 17:51:33 +0000 (17:51 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Apr 2017 17:51:33 +0000 (17:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170094

Reviewed by JF Bastien and Keith Miller.

* heap/Heap.cpp:
(JSC::Heap::resumeThePeriphery):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/heap/Heap.cpp

index c76e26d..661c49d 100644 (file)
@@ -1,3 +1,13 @@
+2017-04-28  Mark Lam  <mark.lam@apple.com>
+
+        Revert instrumentation from https://bugs.webkit.org/show_bug.cgi?id=170086 that is no longer needed.
+        https://bugs.webkit.org/show_bug.cgi?id=170094
+
+        Reviewed by JF Bastien and Keith Miller.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::resumeThePeriphery):
+
 2017-04-27  Andy VanWagoner  <thetalecrafter@gmail.com>
 
         [INTL] Implement the caseFirst option for Intl.Collator
index 819e28f..2d7b8f5 100644 (file)
@@ -1530,30 +1530,6 @@ NEVER_INLINE void Heap::resumeThePeriphery()
     
     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();
     }
     m_collectorBelievesThatTheWorldIsStopped = false;