Merge r243203 - Unreviewed, drop invalid assertions landed in r243163.

Those assertions were causing some API tests to crash. Also include some post-review suggestions from Darin. * Shared/CallbackID.h: (WebKit::CallbackID::operator=): * Shared/OptionalCallbackID.h: (WebKit::OptionalCallbackID::operator=):
WebKit · Aug 4, 2019 · 25ad21d · 25ad21d
1 parent 2b9f711
commit 25ad21d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2019-03-20  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, drop invalid assertions landed in r243163.
+
+        Those assertions were causing some API tests to crash.
+        Also include some post-review suggestions from Darin.
+
+        * Shared/CallbackID.h:
+        (WebKit::CallbackID::operator=):
+        * Shared/OptionalCallbackID.h:
+        (WebKit::OptionalCallbackID::operator=):
+
 2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Build cleanly with GCC 9

diff --git a/Source/WebKit/Shared/CallbackID.h b/Source/WebKit/Shared/CallbackID.h
@@ -49,10 +49,7 @@ class CallbackID {
 
     ALWAYS_INLINE CallbackID& operator=(const CallbackID& otherID)
     {
-        if (this == &otherID)
-            return *this;
         m_id = otherID.m_id;
-        ASSERT(HashTraits<uint64_t>::emptyValue() != m_id && !HashTraits<uint64_t>::isDeletedValue(m_id));
         return *this;
     }
 

diff --git a/Source/WebKit/Shared/OptionalCallbackID.h b/Source/WebKit/Shared/OptionalCallbackID.h
@@ -48,10 +48,7 @@ class OptionalCallbackID {
 
     ALWAYS_INLINE OptionalCallbackID& operator=(const OptionalCallbackID& otherID)
     {
-        if (this == &otherID)
-            return *this;
         m_id = otherID.m_id;
-        ASSERT(!HashTraits<uint64_t>::isDeletedValue(m_id));
         return *this;
     }