Attachment #308539 for bug #170094

View Details Raw Unified Return to Bug 170094



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 NOBODY (OOPS!).

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

2017-04-27  Andy VanWagoner  <thetalecrafter@gmail.com>

        [INTL] Implement the caseFirst option for Intl.Collator



    
    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;

Return to Bug 170094

Lines 1530-1559 NEVER_INLINE void Heap::resumeThePeriphe Source/JavaScriptCore/heap/Heap.cpp_sec1
- Source/JavaScriptCore/heap/Heap.cpp -24 lines
1530		1530
1531	if (!m_collectorBelievesThatTheWorldIsStopped) {	1531	if (!m_collectorBelievesThatTheWorldIsStopped) {
1532	dataLog("Fatal: collector does not believe that the world is stopped.\n");	1532	dataLog("Fatal: collector does not believe that the world is stopped.\n");
1533	#if OS(DARWIN)
1534	// FIXME: Remove this when no longer needed.
1535	// https://bugs.webkit.org/show_bug.cgi?id=170094
1536	#if CPU(X86_64)
1537	unsigned worldState = m_worldState.load();
1538	asm volatile(
1539	"int3"
1540	:
1541	: "a"(m_currentPhase), "b"(m_nextPhase), "c"(worldState), "S"(m_lastServedTicket), "D"(m_lastGrantedTicket)
1542	: "memory");
1543	#elif CPU(ARM64)
1544	unsigned worldState = m_worldState.load();
1545	asm volatile(
1546	"ldrb w0, %0\n"
1547	"ldrb w1, %1\n"
1548	"ldr w2, %2\n"
1549	"ldr x3, %3\n"
1550	"ldr x4, %4\n"
1551	"brk #0"
1552	:
1553	: "m"(m_currentPhase), "m"(m_nextPhase), "m"(worldState), "m"(m_lastServedTicket), "m"(m_lastGrantedTicket)
1554	: "memory");
1555	#endif
1556	#endif // OS(DARWIN)
1557	RELEASE_ASSERT_NOT_REACHED();	1533	RELEASE_ASSERT_NOT_REACHED();
1558	}	1534	}
1559	m_collectorBelievesThatTheWorldIsStopped = false;	1535	m_collectorBelievesThatTheWorldIsStopped = false;

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +10 lines
		1	2017-04-28 Mark Lam <mark.lam@apple.com>
		2
		3	Revert instrumentation from https://bugs.webkit.org/show_bug.cgi?id=170086 that is no longer needed.
		4	https://bugs.webkit.org/show_bug.cgi?id=170094
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* heap/Heap.cpp:
		9	(JSC::Heap::resumeThePeriphery):
		10
1	2017-04-27 Andy VanWagoner <thetalecrafter@gmail.com>	11	2017-04-27 Andy VanWagoner <thetalecrafter@gmail.com>
2		12
3	[INTL] Implement the caseFirst option for Intl.Collator	13	[INTL] Implement the caseFirst option for Intl.Collator