Changeset 196917 in webkit

Timestamp:

Feb 22, 2016, 1:30:51 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196259 - Make sure that locking code that relies on module boundaries for compiler fences uses NEVER_INLINE
​https://bugs.webkit.org/show_bug.cgi?id=153972

Reviewed by Andreas Kling.

When this code was written, we assumed that module boundaries were compiler fences. That might
not be the case if we ever do LTO.

• wtf/Lock.cpp:

(WTF::LockBase::lockSlow):
(WTF::LockBase::unlockSlow):

• wtf/ParkingLot.cpp:

(WTF::ParkingLot::parkConditionally):
(WTF::ParkingLot::unparkOne):
(WTF::ParkingLot::unparkAll):
(WTF::ParkingLot::forEach):

• wtf/WordLock.cpp:

(WTF::WordLock::lockSlow):
(WTF::WordLock::unlockSlow):

Location:

releases/WebKitGTK/webkit-2.10/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Lock.cpp (modified) (2 diffs)
• wtf/ParkingLot.cpp (modified) (5 diffs)
• wtf/WordLock.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog

@@ +1 @@
+2016-02-08  Filip Pizlo  <fpizlo@apple.com>
+
+        Make sure that locking code that relies on module boundaries for compiler fences uses NEVER_INLINE
+        https://bugs.webkit.org/show_bug.cgi?id=153972
+
+        Reviewed by Andreas Kling.
+
+        When this code was written, we assumed that module boundaries were compiler fences. That might
+        not be the case if we ever do LTO.
+
+        * wtf/Lock.cpp:
+        (WTF::LockBase::lockSlow):
+        (WTF::LockBase::unlockSlow):
+        * wtf/ParkingLot.cpp:
+        (WTF::ParkingLot::parkConditionally):
+        (WTF::ParkingLot::unparkOne):
+        (WTF::ParkingLot::unparkAll):
+        (WTF::ParkingLot::forEach):
+        * wtf/WordLock.cpp:
+        (WTF::WordLock::lockSlow):
+        (WTF::WordLock::unlockSlow):
+
 2015-12-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 

releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Lock.cpp

@@ -37 +37 @@
 static const bool verbose = false;
 
-void LockBase::lockSlow()
+NEVER_INLINE void LockBase::lockSlow()
 {
     unsigned spinCount = 0;
@@ -75 +75 @@
 }
 
-void LockBase::unlockSlow()
+NEVER_INLINE void LockBase::unlockSlow()
 {
     // We could get here because the weak CAS in unlock() failed spuriously, or because there is

releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/ParkingLot.cpp

@@ -508 +508 @@
 } // anonymous namespace
 
-bool ParkingLot::parkConditionally(
+NEVER_INLINE bool ParkingLot::parkConditionally(
     const void* address,
     std::function<bool()> validation,
@@ -593 +593 @@
 }
 
-bool ParkingLot::unparkOne(const void* address)
+NEVER_INLINE bool ParkingLot::unparkOne(const void* address)
 {
     if (verbose)
@@ -624 +624 @@
 }
 
-void ParkingLot::unparkOne(
+NEVER_INLINE void ParkingLot::unparkOne(
     const void* address,
     std::function<void(bool didUnparkThread, bool mayHaveMoreThreads)> callback)
@@ -657 +657 @@
 }
 
-void ParkingLot::unparkAll(const void* address)
+NEVER_INLINE void ParkingLot::unparkAll(const void* address)
 {
     if (verbose)
@@ -691 +691 @@
 }
 
-void ParkingLot::forEach(std::function<void(ThreadIdentifier, const void*)> callback)
+NEVER_INLINE void ParkingLot::forEach(std::function<void(ThreadIdentifier, const void*)> callback)
 {
     Vector<Bucket*> bucketsToUnlock = lockHashtable();

releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WordLock.cpp

@@ -78 +78 @@
 } // anonymous namespace
 
-void WordLock::lockSlow()
+NEVER_INLINE void WordLock::lockSlow()
 {
     unsigned spinCount = 0;
@@ -179 +179 @@
 }
 
-void WordLock::unlockSlow()
+NEVER_INLINE void WordLock::unlockSlow()
 {
     // The fast path can fail either because of spurious weak CAS failure, or because someone put a