Title: [201609] trunk/Source
- Revision
- 201609
- Author
- [email protected]
- Date
- 2016-06-02 12:21:53 -0700 (Thu, 02 Jun 2016)
Log Message
Make it harder to accidentally pass an integer to a locker.
Rubber stamped by Keith Miller.
Source/_javascript_Core:
* 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):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (201608 => 201609)
--- trunk/Source/_javascript_Core/ChangeLog 2016-06-02 19:05:40 UTC (rev 201608)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-06-02 19:21:53 UTC (rev 201609)
@@ -1,5 +1,14 @@
2016-06-02 Filip Pizlo <[email protected]>
+ 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 <[email protected]>
+
Make it easier to use NoLockingNecessary
https://bugs.webkit.org/show_bug.cgi?id=158306
Modified: trunk/Source/_javascript_Core/runtime/ConcurrentJITLock.h (201608 => 201609)
--- trunk/Source/_javascript_Core/runtime/ConcurrentJITLock.h 2016-06-02 19:05:40 UTC (rev 201608)
+++ trunk/Source/_javascript_Core/runtime/ConcurrentJITLock.h 2016-06-02 19:21:53 UTC (rev 201609)
@@ -131,6 +131,15 @@
#endif
{
}
+
+ 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)
private:
Modified: trunk/Source/WTF/ChangeLog (201608 => 201609)
--- trunk/Source/WTF/ChangeLog 2016-06-02 19:05:40 UTC (rev 201608)
+++ trunk/Source/WTF/ChangeLog 2016-06-02 19:21:53 UTC (rev 201609)
@@ -1,5 +1,17 @@
2016-06-02 Filip Pizlo <[email protected]>
+ 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 <[email protected]>
+
Make it easier to use NoLockingNecessary
https://bugs.webkit.org/show_bug.cgi?id=158306
Modified: trunk/Source/WTF/wtf/Locker.h (201608 => 201609)
--- trunk/Source/WTF/wtf/Locker.h 2016-06-02 19:05:40 UTC (rev 201608)
+++ trunk/Source/WTF/wtf/Locker.h 2016-06-02 19:21:53 UTC (rev 201609)
@@ -28,6 +28,7 @@
#ifndef Locker_h
#define Locker_h
+#include <wtf/Assertions.h>
#include <wtf/Noncopyable.h>
namespace WTF {
@@ -46,6 +47,11 @@
// this often happens when an object is newly allocated and it can not
// be accessed concurrently.
Locker(NoLockingNecessaryTag) : m_lockable(nullptr) { }
+
+ NO_RETURN_DUE_TO_CRASH Locker(int)
+ {
+ RELEASE_ASSERT_NOT_REACHED();
+ }
~Locker()
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
