Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (181978 => 181979)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-25 22:56:50 UTC (rev 181979)
@@ -1,3 +1,12 @@
+2015-03-25 Filip Pizlo <[email protected]>
+
+ Change Atomic methods from using the_wrong_naming_conventions to using theRightNamingConventions. Also make seq_cst the default.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::visitAggregate):
+
2015-03-25 Joseph Pecoraro <[email protected]>
Fix formatting in BuiltinExecutables
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (181978 => 181979)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-03-25 22:56:50 UTC (rev 181979)
@@ -2203,7 +2203,7 @@
// I may be asked to scan myself more than once, and it may even happen concurrently.
// To this end, use an atomic operation to check (and set) if I've been called already.
// Only one thread may proceed past this point - whichever one wins the atomic set race.
- bool setByMe = m_visitAggregateHasBeenCalled.compare_exchange_strong(false, true, std::memory_order_acquire);
+ bool setByMe = m_visitAggregateHasBeenCalled.compareExchangeStrong(false, true);
if (!setByMe)
return;
#endif // ENABLE(PARALLEL_GC)
Modified: trunk/Source/WTF/ChangeLog (181978 => 181979)
--- trunk/Source/WTF/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/WTF/ChangeLog 2015-03-25 22:56:50 UTC (rev 181979)
@@ -1,3 +1,21 @@
+2015-03-25 Filip Pizlo <[email protected]>
+
+ Change Atomic methods from using the_wrong_naming_conventions to using theRightNamingConventions. Also make seq_cst the default.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * wtf/Atomics.h:
+ (WTF::Atomic::load):
+ (WTF::Atomic::store):
+ (WTF::Atomic::compareExchangeWeak):
+ (WTF::Atomic::compareExchangeStrong):
+ (WTF::Atomic::compare_exchange_weak): Deleted.
+ (WTF::Atomic::compare_exchange_strong): Deleted.
+ * wtf/ByteSpinLock.h:
+ (WTF::ByteSpinLock::lock):
+ * wtf/SpinLock.h:
+ (WTF::SpinLockBase::lock):
+
2015-03-24 Beth Dakin <[email protected]>
Add events related to force click gesture
Modified: trunk/Source/WTF/wtf/Atomics.h (181978 => 181979)
--- trunk/Source/WTF/wtf/Atomics.h 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/WTF/wtf/Atomics.h 2015-03-25 22:56:50 UTC (rev 181979)
@@ -81,18 +81,21 @@
template<typename T>
struct Atomic {
+ // Don't pass a non-default value for the order parameter unless you really know
+ // what you are doing and have thought about it very hard. The cost of seq_cst
+ // is usually not high enough to justify the risk.
- T load(std::memory_order order) const { return value.load(order); }
+ T load(std::memory_order order = std::memory_order_seq_cst) const { return value.load(order); }
- void store(T desired, std::memory_order order) { value.store(desired, order); }
+ void store(T desired, std::memory_order order = std::memory_order_seq_cst) { value.store(desired, order); }
- bool compare_exchange_weak(T expected, T desired, std::memory_order order)
+ bool compareExchangeWeak(T expected, T desired, std::memory_order order = std::memory_order_seq_cst)
{
T expectedOrActual = expected;
return value.compare_exchange_weak(expectedOrActual, desired, order);
}
- bool compare_exchange_strong(T expected, T desired, std::memory_order order)
+ bool compareExchangeStrong(T expected, T desired, std::memory_order order = std::memory_order_seq_cst)
{
T expectedOrActual = expected;
return value.compare_exchange_strong(expectedOrActual, desired, order);
Modified: trunk/Source/WTF/wtf/ByteSpinLock.h (181978 => 181979)
--- trunk/Source/WTF/wtf/ByteSpinLock.h 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/WTF/wtf/ByteSpinLock.h 2015-03-25 22:56:50 UTC (rev 181979)
@@ -44,7 +44,7 @@
void lock()
{
- while (!m_lock.compare_exchange_weak(false, true, std::memory_order_acquire))
+ while (!m_lock.compareExchangeWeak(false, true, std::memory_order_acquire))
std::this_thread::yield();
}
Modified: trunk/Source/WTF/wtf/SpinLock.h (181978 => 181979)
--- trunk/Source/WTF/wtf/SpinLock.h 2015-03-25 22:56:19 UTC (rev 181978)
+++ trunk/Source/WTF/wtf/SpinLock.h 2015-03-25 22:56:50 UTC (rev 181979)
@@ -38,7 +38,7 @@
void lock()
{
- while (!m_lock.compare_exchange_weak(0, 1, std::memory_order_acquire))
+ while (!m_lock.compareExchangeWeak(0, 1, std::memory_order_acquire))
std::this_thread::yield();
}
