Attachment #261712 for bug #149438

View Details Raw Unified Return to Bug 149438

| Differences between



2015-09-21  Filip Pizlo  <fpizlo@apple.com>

        Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
        https://bugs.webkit.org/show_bug.cgi?id=149438

        Reviewed by NOBODY (OOPS!).

        * heap/HeapInlines.h:
        (JSC::Heap::reportExtraMemoryVisited):
        (JSC::Heap::deprecatedReportExtraMemory):

2015-09-21  Commit Queue  <commit-queue@webkit.org>

        Unreviewed, rolling out r190086.

Lines 63-69 inline bool Bitmap::concurrentTestAndSet Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp_sec1
- Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp -1 / +1 lines
63	oldValue = *wordPtr;	63	oldValue = *wordPtr;
64	if (oldValue & mask)	64	if (oldValue & mask)
65	return true;	65	return true;
66	} while (!WTF::weakCompareAndSwap(wordPtr, oldValue, oldValue \| mask));	66	} while (!WTF::weakCompareAndSwap(wordPtr, oldValue, static_cast<uint8_t>(oldValue \| mask)));
67	return false;	67	return false;
68	}	68	}
69		69




    size_t* counter = &m_extraMemorySize;
    
#if ENABLE(COMPARE_AND_SWAP)
    for (;;) {
        size_t oldSize = *counter;
        if (WTF::weakCompareAndSwap(counter, oldSize, oldSize + size))
            return;
    }
#else
    (*counter) += size;
#endif
}

inline void Heap::deprecatedReportExtraMemory(size_t size)



2015-09-21  Filip Pizlo  <fpizlo@apple.com>

        Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
        https://bugs.webkit.org/show_bug.cgi?id=149438

        Reviewed by NOBODY (OOPS!).

        * wtf/Atomics.h: Make weakCompareAndSwap() just forward to the system CAS via WTF::Atomic.
        (WTF::weakCompareAndSwap):
        (WTF::weakCompareAndSwapUIntPtr): Deleted.
        (WTF::weakCompareAndSwapSize): Deleted.
        * wtf/Bitmap.h: Small changes to use the new API.
        (WTF::WordType>::concurrentTestAndSet):
        * wtf/Platform.h: Remove ENABLE(COMPARE_AND_SWAP)

2015-09-21  Csaba Osztrogonác  <ossy@webkit.org>

        Remove old GCC cruft from wtf/StdLibExtras.h



    std::atomic<T> value;
};

// This is a weak CAS function that takes a direct pointer and has no portable fencing guarantees.
template<typename T>
inline bool weakCompareAndSwap(volatile T* location, T expected, T newValue)
    return InterlockedCompareExchange(reinterpret_cast<LONG volatile*>(location), static_cast<LONG>(newValue), static_cast<LONG>(expected)) == static_cast<LONG>(expected);
}

inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
{
    return InterlockedCompareExchangePointer(location, newValue, expected) == expected;
}
#else // OS(WINDOWS) --> not windows
inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue) 
{
#if ENABLE(COMPARE_AND_SWAP)
#if CPU(X86) || CPU(X86_64)
    unsigned char result;
    asm volatile(
        "lock; cmpxchgl %3, %2\n\t"
        "sete %1"
        : "+a"(expected), "=q"(result), "+m"(*location)
        : "r"(newValue)
        : "memory"
        );
#elif CPU(ARM_THUMB2)
    unsigned tmp;
    unsigned result;
    asm volatile(
        "movw %1, #1\n\t"
        "ldrex %2, %0\n\t"
        "cmp %3, %2\n\t"
        "bne.n 0f\n\t"
        "strex %1, %4, %0\n\t"
        "0:"
        : "+Q"(*location), "=&r"(result), "=&r"(tmp)
        : "r"(expected), "r"(newValue)
        : "memory");
    result = !result;
#elif CPU(ARM64) && COMPILER(GCC_OR_CLANG)
    unsigned tmp;
    unsigned result;
    asm volatile(
        "mov %w1, #1\n\t"
        "ldxr %w2, [%0]\n\t"
        "cmp %w3, %w2\n\t"
        "b.ne 0f\n\t"
        "stxr %w1, %w4, [%0]\n\t"
        "0:"
        : "+r"(location), "=&r"(result), "=&r"(tmp)
        : "r"(expected), "r"(newValue)
        : "memory");
    result = !result;
#elif CPU(ARM64)
    unsigned tmp;
    unsigned result;
    asm volatile(
        "mov %w1, #1\n\t"
        "ldxr %w2, %0\n\t"
        "cmp %w3, %w2\n\t"
        "b.ne 0f\n\t"
        "stxr %w1, %w4, %0\n\t"
        "0:"
        : "+m"(*location), "=&r"(result), "=&r"(tmp)
        : "r"(expected), "r"(newValue)
        : "memory");
    result = !result;
#else
#error "Bad architecture for compare and swap."
#endif
    return result;
#else
    UNUSED_PARAM(location);
    UNUSED_PARAM(expected);
    UNUSED_PARAM(newValue);
    CRASH();
    return false;
#endif
}

inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
{
#if ENABLE(COMPARE_AND_SWAP)
#if CPU(X86_64)
    bool result;
    asm volatile(
        "lock; cmpxchgq %3, %2\n\t"
        "sete %1"
        : "+a"(expected), "=q"(result), "+m"(*location)
        : "r"(newValue)
        : "memory"
        );
    return result;
#elif CPU(ARM64) && COMPILER(GCC_OR_CLANG)
    bool result;
    void* tmp;
    asm volatile(
        "mov %w1, #1\n\t"
        "ldxr %x2, [%0]\n\t"
        "cmp %x3, %x2\n\t"
        "b.ne 0f\n\t"
        "stxr %w1, %x4, [%0]\n\t"
        "0:"
        : "+r"(location), "=&r"(result), "=&r"(tmp)
        : "r"(expected), "r"(newValue)
        : "memory");
    return !result;
#elif CPU(ARM64)
    bool result;
    void* tmp;
    asm volatile(
        "mov %w1, #1\n\t"
        "ldxr %x2, %0\n\t"
        "cmp %x3, %x2\n\t"
        "b.ne 0f\n\t"
        "stxr %w1, %x4, %0\n\t"
        "0:"
        : "+m"(*location), "=&r"(result), "=&r"(tmp)
        : "r"(expected), "r"(newValue)
        : "memory");
    return !result;
#else
    return weakCompareAndSwap(bitwise_cast<unsigned*>(location), bitwise_cast<unsigned>(expected), bitwise_cast<unsigned>(newValue));
#endif
#else // ENABLE(COMPARE_AND_SWAP)
    UNUSED_PARAM(location);
    UNUSED_PARAM(expected);
    UNUSED_PARAM(newValue);
    CRASH();
    return 0;
#endif // ENABLE(COMPARE_AND_SWAP)
}
#endif // OS(WINDOWS) (end of the not-windows case)

inline bool weakCompareAndSwapUIntPtr(volatile uintptr_t* location, uintptr_t expected, uintptr_t newValue)
{
    return weakCompareAndSwap(reinterpret_cast<void*volatile*>(location), reinterpret_cast<void*>(expected), reinterpret_cast<void*>(newValue));
}

inline bool weakCompareAndSwapSize(volatile size_t* location, size_t expected, size_t newValue)
{
    return bitwise_cast<Atomic<T>*>(location)->compareExchangeWeak(expected, newValue, std::memory_order_relaxed);
}

// Just a compiler fence. Has no effect on the hardware, but tells the compiler


#endif

inline bool weakCompareAndSwap(uint8_t* location, uint8_t expected, uint8_t newValue)
{
#if ENABLE(COMPARE_AND_SWAP)
#if !OS(WINDOWS) && (CPU(X86) || CPU(X86_64))
    unsigned char result;
    asm volatile(
        "lock; cmpxchgb %3, %2\n\t"
        "sete %1"
        : "+a"(expected), "=q"(result), "+m"(*location)
        : "q"(newValue)
        : "memory"
        );
    return result;
#elif OS(WINDOWS) && CPU(X86)
    // FIXME: We need a 64-bit ASM implementation, but this cannot be inline due to
    // Microsoft's decision to exclude it from the compiler.
    bool result = false;

    __asm {
        mov al, expected
        mov edx, location
        mov cl, newValue
        lock cmpxchg byte ptr[edx], cl
        setz result
    }

    return result;
#else
    uintptr_t locationValue = bitwise_cast<uintptr_t>(location);
    uintptr_t alignedLocationValue = locationValue & ~(sizeof(unsigned) - 1);
    uintptr_t locationOffset = locationValue - alignedLocationValue;
    ASSERT(locationOffset < sizeof(unsigned));
    unsigned* alignedLocation = bitwise_cast<unsigned*>(alignedLocationValue);
    // Make sure that this load is always issued and never optimized away.
    unsigned oldAlignedValue = *const_cast<volatile unsigned*>(alignedLocation);

    struct Splicer {
        static unsigned splice(unsigned value, uint8_t byte, uintptr_t byteIndex)
        {
            union {
                unsigned word;
                uint8_t bytes[sizeof(unsigned)];
            } u;
            u.word = value;
            u.bytes[byteIndex] = byte;
            return u.word;
        }
    };
    
    unsigned expectedAlignedValue = Splicer::splice(oldAlignedValue, expected, locationOffset);
    unsigned newAlignedValue = Splicer::splice(oldAlignedValue, newValue, locationOffset);

    return weakCompareAndSwap(alignedLocation, expectedAlignedValue, newAlignedValue);
#endif
#else
    UNUSED_PARAM(location);
    UNUSED_PARAM(expected);
    UNUSED_PARAM(newValue);
    CRASH();
    return false;
#endif
}

} // namespace WTF

using WTF::Atomic;



        oldValue = *wordPtr;
        if (oldValue & mask)
            return true;
    } while (!weakCompareAndSwap(wordPtr, oldValue, static_cast<WordType>(oldValue | mask)));
    return false;
}


        oldValue = *wordPtr;
        if (!(oldValue & mask))
            return false;
    } while (!weakCompareAndSwap(wordPtr, oldValue, static_cast<WordType>(oldValue & ~mask)));
    return true;
}




#define USE_IMLANG_FONT_LINK2 1
#endif

#if !defined(ENABLE_PARALLEL_GC) && (OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK))
#define ENABLE_COMPARE_AND_SWAP 1
#endif

#if !defined(ENABLE_PARALLEL_GC) && (OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
#define ENABLE_PARALLEL_GC 1
#endif




2015-09-21  Filip Pizlo  <fpizlo@apple.com>

        Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
        https://bugs.webkit.org/show_bug.cgi?id=149438

        Reviewed by NOBODY (OOPS!).

        No new tests because no new behavior.

        * platform/text/TextBreakIterator.cpp:
        (WebCore::compareAndSwapNonSharedCharacterBreakIterator):
        (WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator):

2015-09-21  Gwang Yoon Hwang  <yoon@igalia.com>

        [Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer




static inline bool compareAndSwapNonSharedCharacterBreakIterator(TextBreakIterator* expected, TextBreakIterator* newValue)
{
#if ENABLE(COMPARE_AND_SWAP)
    return WTF::weakCompareAndSwap(reinterpret_cast<void**>(&nonSharedCharacterBreakIterator), expected, newValue);
#else
    static StaticLock nonSharedCharacterBreakIteratorMutex;
    std::lock_guard<StaticLock> locker(nonSharedCharacterBreakIteratorMutex);
    if (nonSharedCharacterBreakIterator != expected)
        return false;
    nonSharedCharacterBreakIterator = newValue;
    return true;
#endif
}

NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(StringView string)

Return to Bug 149438

Lines 171-185 inline void Heap::reportExtraMemoryVisit Source/JavaScriptCore/heap/HeapInlines.h_sec1
- Source/JavaScriptCore/heap/HeapInlines.h -5 / +1 lines
171		171
172	size_t* counter = &m_extraMemorySize;	172	size_t* counter = &m_extraMemorySize;
173		173
174	#if ENABLE(COMPARE_AND_SWAP)
175	for (;;) {	174	for (;;) {
176	size_t oldSize = *counter;	175	size_t oldSize = *counter;
177	if (WTF::weakCompareAndSwapSize(counter, oldSize, oldSize + size))	176	if (WTF::weakCompareAndSwap(counter, oldSize, oldSize + size))
178	return;	177	return;
179	}	178	}
180	#else
181	(*counter) += size;
182	#endif
183	}	179	}
184		180
185	inline void Heap::deprecatedReportExtraMemory(size_t size)	181	inline void Heap::deprecatedReportExtraMemory(size_t size)

Lines 124-130 inline bool Bitmap<size, atomicMode, Wor Source/WTF/wtf/Bitmap.h_sec1
- Source/WTF/wtf/Bitmap.h -2 / +2 lines
124	oldValue = *wordPtr;	124	oldValue = *wordPtr;
125	if (oldValue & mask)	125	if (oldValue & mask)
126	return true;	126	return true;
127	} while (!weakCompareAndSwap(wordPtr, oldValue, oldValue \| mask));	127	} while (!weakCompareAndSwap(wordPtr, oldValue, static_cast<WordType>(oldValue \| mask)));
128	return false;	128	return false;
129	}	129	}
130		130
Lines 144-150 inline bool Bitmap<size, atomicMode, Wor Source/WTF/wtf/Bitmap.h_sec2
144	oldValue = *wordPtr;	144	oldValue = *wordPtr;
145	if (!(oldValue & mask))	145	if (!(oldValue & mask))
146	return false;	146	return false;
147	} while (!weakCompareAndSwap(wordPtr, oldValue, oldValue & ~mask));	147	} while (!weakCompareAndSwap(wordPtr, oldValue, static_cast<WordType>(oldValue & ~mask)));
148	return true;	148	return true;
149	}	149	}
150		150

Lines 975-985 Source/WTF/wtf/Platform.h_sec1
- Source/WTF/wtf/Platform.h -5 / +1 lines
975	#define USE_IMLANG_FONT_LINK2 1	975	#define USE_IMLANG_FONT_LINK2 1
976	#endif	976	#endif
977		977
978	#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) \|\| (COMPILER(GCC_OR_CLANG) && (CPU(X86) \|\| CPU(X86_64) \|\| CPU(ARM_THUMB2) \|\| CPU(ARM64))))	978	#if !defined(ENABLE_PARALLEL_GC) && (OS(DARWIN) \|\| PLATFORM(EFL) \|\| PLATFORM(GTK))
979	#define ENABLE_COMPARE_AND_SWAP 1
980	#endif
981
982	#if !defined(ENABLE_PARALLEL_GC) && (OS(DARWIN) \|\| PLATFORM(EFL) \|\| PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
983	#define ENABLE_PARALLEL_GC 1	979	#define ENABLE_PARALLEL_GC 1
984	#endif	980	#endif
985		981

Lines 812-827 static TextBreakIterator* nonSharedChara Source/WebCore/platform/text/TextBreakIterator.cpp_sec1
- Source/WebCore/platform/text/TextBreakIterator.cpp -9 lines
812		812
813	static inline bool compareAndSwapNonSharedCharacterBreakIterator(TextBreakIterator* expected, TextBreakIterator* newValue)	813	static inline bool compareAndSwapNonSharedCharacterBreakIterator(TextBreakIterator* expected, TextBreakIterator* newValue)
814	{	814	{
815	#if ENABLE(COMPARE_AND_SWAP)
816	return WTF::weakCompareAndSwap(reinterpret_cast<void**>(&nonSharedCharacterBreakIterator), expected, newValue);	815	return WTF::weakCompareAndSwap(reinterpret_cast<void**>(&nonSharedCharacterBreakIterator), expected, newValue);
817	#else
818	static StaticLock nonSharedCharacterBreakIteratorMutex;
819	std::lock_guard<StaticLock> locker(nonSharedCharacterBreakIteratorMutex);
820	if (nonSharedCharacterBreakIterator != expected)
821	return false;
822	nonSharedCharacterBreakIterator = newValue;
823	return true;
824	#endif
825	}	816	}
826		817
827	NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(StringView string)	818	NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(StringView string)

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +11 lines
		1	2015-09-21 Filip Pizlo <fpizlo@apple.com>
		2
		3	Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
		4	https://bugs.webkit.org/show_bug.cgi?id=149438
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* heap/HeapInlines.h:
		9	(JSC::Heap::reportExtraMemoryVisited):
		10	(JSC::Heap::deprecatedReportExtraMemory):
		11
1	2015-09-21 Commit Queue <commit-queue@webkit.org>	12	2015-09-21 Commit Queue <commit-queue@webkit.org>
2		13
3	Unreviewed, rolling out r190086.	14	Unreviewed, rolling out r190086.

Lines 1-3 Source/WTF/ChangeLog_sec1
- Source/WTF/ChangeLog +15 lines
		1	2015-09-21 Filip Pizlo <fpizlo@apple.com>
		2
		3	Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
		4	https://bugs.webkit.org/show_bug.cgi?id=149438
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wtf/Atomics.h: Make weakCompareAndSwap() just forward to the system CAS via WTF::Atomic.
		9	(WTF::weakCompareAndSwap):
		10	(WTF::weakCompareAndSwapUIntPtr): Deleted.
		11	(WTF::weakCompareAndSwapSize): Deleted.
		12	* wtf/Bitmap.h: Small changes to use the new API.
		13	(WTF::WordType>::concurrentTestAndSet):
		14	* wtf/Platform.h: Remove ENABLE(COMPARE_AND_SWAP)
		15
1	2015-09-21 Csaba Osztrogonác <ossy@webkit.org>	16	2015-09-21 Csaba Osztrogonác <ossy@webkit.org>
2		17
3	Remove old GCC cruft from wtf/StdLibExtras.h	18	Remove old GCC cruft from wtf/StdLibExtras.h

Lines 113-258 struct Atomic { Source/WTF/wtf/Atomics.h_sec1
- Source/WTF/wtf/Atomics.h -202 / +4 lines
113	std::atomic<T> value;	113	std::atomic<T> value;
114	};	114	};
115		115
116	#if OS(WINDOWS)	116	// This is a weak CAS function that takes a direct pointer and has no portable fencing guarantees.
117	inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)	117	template<typename T>
118	{	118	inline bool weakCompareAndSwap(volatile T* location, T expected, T newValue)
119	return InterlockedCompareExchange(reinterpret_cast<LONG volatile*>(location), static_cast<LONG>(newValue), static_cast<LONG>(expected)) == static_cast<LONG>(expected);
120	}
121
122	inline bool weakCompareAndSwap(voidvolatile location, void* expected, void* newValue)
123	{
124	return InterlockedCompareExchangePointer(location, newValue, expected) == expected;
125	}
126	#else // OS(WINDOWS) --> not windows
127	inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)
128	{
129	#if ENABLE(COMPARE_AND_SWAP)
130	#if CPU(X86) \|\| CPU(X86_64)
131	unsigned char result;
132	asm volatile(
133	"lock; cmpxchgl %3, %2\n\t"
134	"sete %1"
135	: "+a"(expected), "=q"(result), "+m"(*location)
136	: "r"(newValue)
137	: "memory"
138	);
139	#elif CPU(ARM_THUMB2)
140	unsigned tmp;
141	unsigned result;
142	asm volatile(
143	"movw %1, #1\n\t"
144	"ldrex %2, %0\n\t"
145	"cmp %3, %2\n\t"
146	"bne.n 0f\n\t"
147	"strex %1, %4, %0\n\t"
148	"0:"
149	: "+Q"(*location), "=&r"(result), "=&r"(tmp)
150	: "r"(expected), "r"(newValue)
151	: "memory");
152	result = !result;
153	#elif CPU(ARM64) && COMPILER(GCC_OR_CLANG)
154	unsigned tmp;
155	unsigned result;
156	asm volatile(
157	"mov %w1, #1\n\t"
158	"ldxr %w2, [%0]\n\t"
159	"cmp %w3, %w2\n\t"
160	"b.ne 0f\n\t"
161	"stxr %w1, %w4, [%0]\n\t"
162	"0:"
163	: "+r"(location), "=&r"(result), "=&r"(tmp)
164	: "r"(expected), "r"(newValue)
165	: "memory");
166	result = !result;
167	#elif CPU(ARM64)
168	unsigned tmp;
169	unsigned result;
170	asm volatile(
171	"mov %w1, #1\n\t"
172	"ldxr %w2, %0\n\t"
173	"cmp %w3, %w2\n\t"
174	"b.ne 0f\n\t"
175	"stxr %w1, %w4, %0\n\t"
176	"0:"
177	: "+m"(*location), "=&r"(result), "=&r"(tmp)
178	: "r"(expected), "r"(newValue)
179	: "memory");
180	result = !result;
181	#else
182	#error "Bad architecture for compare and swap."
183	#endif
184	return result;
185	#else
186	UNUSED_PARAM(location);
187	UNUSED_PARAM(expected);
188	UNUSED_PARAM(newValue);
189	CRASH();
190	return false;
191	#endif
192	}
193
194	inline bool weakCompareAndSwap(voidvolatile location, void* expected, void* newValue)
195	{
196	#if ENABLE(COMPARE_AND_SWAP)
197	#if CPU(X86_64)
198	bool result;
199	asm volatile(
200	"lock; cmpxchgq %3, %2\n\t"
201	"sete %1"
202	: "+a"(expected), "=q"(result), "+m"(*location)
203	: "r"(newValue)
204	: "memory"
205	);
206	return result;
207	#elif CPU(ARM64) && COMPILER(GCC_OR_CLANG)
208	bool result;
209	void* tmp;
210	asm volatile(
211	"mov %w1, #1\n\t"
212	"ldxr %x2, [%0]\n\t"
213	"cmp %x3, %x2\n\t"
214	"b.ne 0f\n\t"
215	"stxr %w1, %x4, [%0]\n\t"
216	"0:"
217	: "+r"(location), "=&r"(result), "=&r"(tmp)
218	: "r"(expected), "r"(newValue)
219	: "memory");
220	return !result;
221	#elif CPU(ARM64)
222	bool result;
223	void* tmp;
224	asm volatile(
225	"mov %w1, #1\n\t"
226	"ldxr %x2, %0\n\t"
227	"cmp %x3, %x2\n\t"
228	"b.ne 0f\n\t"
229	"stxr %w1, %x4, %0\n\t"
230	"0:"
231	: "+m"(*location), "=&r"(result), "=&r"(tmp)
232	: "r"(expected), "r"(newValue)
233	: "memory");
234	return !result;
235	#else
236	return weakCompareAndSwap(bitwise_cast<unsigned*>(location), bitwise_cast<unsigned>(expected), bitwise_cast<unsigned>(newValue));
237	#endif
238	#else // ENABLE(COMPARE_AND_SWAP)
239	UNUSED_PARAM(location);
240	UNUSED_PARAM(expected);
241	UNUSED_PARAM(newValue);
242	CRASH();
243	return 0;
244	#endif // ENABLE(COMPARE_AND_SWAP)
245	}
246	#endif // OS(WINDOWS) (end of the not-windows case)
247
248	inline bool weakCompareAndSwapUIntPtr(volatile uintptr_t* location, uintptr_t expected, uintptr_t newValue)
249	{
250	return weakCompareAndSwap(reinterpret_cast<voidvolatile>(location), reinterpret_cast<void>(expected), reinterpret_cast<void>(newValue));
251	}
252
253	inline bool weakCompareAndSwapSize(volatile size_t* location, size_t expected, size_t newValue)
254	{	119	{
255	return weakCompareAndSwap(reinterpret_cast<voidvolatile>(location), reinterpret_cast<void>(expected), reinterpret_cast<void>(newValue));	120	return bitwise_cast<Atomic<T>*>(location)->compareExchangeWeak(expected, newValue, std::memory_order_relaxed);
256	}	121	}
257		122
258	// Just a compiler fence. Has no effect on the hardware, but tells the compiler	123	// Just a compiler fence. Has no effect on the hardware, but tells the compiler
Lines 322-390 inline void memoryBarrierBeforeUnlock() Source/WTF/wtf/Atomics.h_sec2
322		187
323	#endif	188	#endif
324		189
325	inline bool weakCompareAndSwap(uint8_t* location, uint8_t expected, uint8_t newValue)
326	{
327	#if ENABLE(COMPARE_AND_SWAP)
328	#if !OS(WINDOWS) && (CPU(X86) \|\| CPU(X86_64))
329	unsigned char result;
330	asm volatile(
331	"lock; cmpxchgb %3, %2\n\t"
332	"sete %1"
333	: "+a"(expected), "=q"(result), "+m"(*location)
334	: "q"(newValue)
335	: "memory"
336	);
337	return result;
338	#elif OS(WINDOWS) && CPU(X86)
339	// FIXME: We need a 64-bit ASM implementation, but this cannot be inline due to
340	// Microsoft's decision to exclude it from the compiler.
341	bool result = false;
342
343	__asm {
344	mov al, expected
345	mov edx, location
346	mov cl, newValue
347	lock cmpxchg byte ptr[edx], cl
348	setz result
349	}
350
351	return result;
352	#else
353	uintptr_t locationValue = bitwise_cast<uintptr_t>(location);
354	uintptr_t alignedLocationValue = locationValue & ~(sizeof(unsigned) - 1);
355	uintptr_t locationOffset = locationValue - alignedLocationValue;
356	ASSERT(locationOffset < sizeof(unsigned));
357	unsigned* alignedLocation = bitwise_cast<unsigned*>(alignedLocationValue);
358	// Make sure that this load is always issued and never optimized away.
359	unsigned oldAlignedValue = const_cast<volatile unsigned>(alignedLocation);
360
361	struct Splicer {
362	static unsigned splice(unsigned value, uint8_t byte, uintptr_t byteIndex)
363	{
364	union {
365	unsigned word;
366	uint8_t bytes[sizeof(unsigned)];
367	} u;
368	u.word = value;
369	u.bytes[byteIndex] = byte;
370	return u.word;
371	}
372	};
373
374	unsigned expectedAlignedValue = Splicer::splice(oldAlignedValue, expected, locationOffset);
375	unsigned newAlignedValue = Splicer::splice(oldAlignedValue, newValue, locationOffset);
376
377	return weakCompareAndSwap(alignedLocation, expectedAlignedValue, newAlignedValue);
378	#endif
379	#else
380	UNUSED_PARAM(location);
381	UNUSED_PARAM(expected);
382	UNUSED_PARAM(newValue);
383	CRASH();
384	return false;
385	#endif
386	}
387
388	} // namespace WTF	190	} // namespace WTF
389		191
390	using WTF::Atomic;	192	using WTF::Atomic;

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +13 lines
		1	2015-09-21 Filip Pizlo <fpizlo@apple.com>
		2
		3	Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
		4	https://bugs.webkit.org/show_bug.cgi?id=149438
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new tests because no new behavior.
		9
		10	* platform/text/TextBreakIterator.cpp:
		11	(WebCore::compareAndSwapNonSharedCharacterBreakIterator):
		12	(WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator):
		13
1	2015-09-21 Gwang Yoon Hwang <yoon@igalia.com>	14	2015-09-21 Gwang Yoon Hwang <yoon@igalia.com>
2		15
3	[Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer	16	[Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer