Changeset 201609 in webkit

Timestamp:

Jun 2, 2016, 12:21:53 PM (10 years ago)

Author:

fpizlo@apple.com

Message:

Make it harder to accidentally pass an integer to a locker.

Rubber stamped by Keith Miller.
Source/JavaScriptCore:

• runtime/ConcurrentJITLock.h:

(JSC::ConcurrentJITLocker::ConcurrentJITLocker):

Source/WTF:

See here for the discussion: ​https://bugs.webkit.org/show_bug.cgi?id=158306#c3

• wtf/Locker.h:

(WTF::Locker::Locker):
(WTF::Locker::~Locker):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/ConcurrentJITLock.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Locker.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-06-02  Filip Pizlo  <fpizlo@apple.com>
+
+        Make it harder to accidentally pass an integer to a locker.
+
+        Rubber stamped by Keith Miller.
+
+        * runtime/ConcurrentJITLock.h:
+        (JSC::ConcurrentJITLocker::ConcurrentJITLocker):
+
 2016-06-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ConcurrentJITLock.h

@@ -132 +132 @@
     {
     }
+    
+    NO_RETURN_DUE_TO_CRASH ConcurrentJITLocker(int)
+        : ConcurrentJITLockerBase(NoLockingNecessary)
+#if ENABLE(CONCURRENT_JIT) && !defined(NDEBUG)
+        , m_disallowGC(Nullopt)
+#endif
+    {
+        RELEASE_ASSERT_NOT_REACHED();
+    }
 
 #if ENABLE(CONCURRENT_JIT) && !defined(NDEBUG)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-06-02  Filip Pizlo  <fpizlo@apple.com>
+
+        Make it harder to accidentally pass an integer to a locker.
+
+        Rubber stamped by Keith Miller.
+        
+        See here for the discussion: https://bugs.webkit.org/show_bug.cgi?id=158306#c3
+
+        * wtf/Locker.h:
+        (WTF::Locker::Locker):
+        (WTF::Locker::~Locker):
+
 2016-06-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/Locker.h

@@ -29 +29 @@
 #define Locker_h
 
+#include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
 
@@ -47 +48 @@
     // be accessed concurrently.
     Locker(NoLockingNecessaryTag) : m_lockable(nullptr) { }
+    
+    NO_RETURN_DUE_TO_CRASH Locker(int)
+    {
+        RELEASE_ASSERT_NOT_REACHED();
+    }
 
     ~Locker()