Changeset 234980 in webkit

Timestamp:

Aug 17, 2018 6:04:17 AM (6 years ago)

Author:

ddkilzer@apple.com

Message:

WTF's internal std::optional implementation should release assert on all bad accesses
<​https://webkit.org/b/187669>

Reviewed by Ryosuke Niwa.

• wtf/Assertions.h:

(RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT): Add macro definitions.

• wtf/Optional.h:

(std::optional::operator -> const):
(std::optional::operator ->):
(std::optional::operator * const):
(std::optional::operator *):
(std::optional::value const):
(std::optional::value):
(std::optional<T::operator-> const):
(std::optional<T::operator* const):
(std::optional<T::value const):

• Change ASSERT_UNDER_CONSTEXPR_CONTEXT() macros to RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT() macros.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.h (modified) (2 diffs)
• wtf/Optional.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-08-17  David Kilzer  <ddkilzer@apple.com>
+
+        WTF's internal std::optional implementation should release assert on all bad accesses
+        <https://webkit.org/b/187669>
+
+        Reviewed by Ryosuke Niwa.
+
+        * wtf/Assertions.h:
+        (RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT): Add macro definitions.
+        * wtf/Optional.h:
+        (std::optional::operator -> const):
+        (std::optional::operator ->):
+        (std::optional::operator * const):
+        (std::optional::operator *):
+        (std::optional::value const):
+        (std::optional::value):
+        (std::optional<T::operator-> const):
+        (std::optional<T::operator* const):
+        (std::optional<T::value const):
+        - Change ASSERT_UNDER_CONSTEXPR_CONTEXT() macros to
+          RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT() macros.
+
 2018-08-16  Andy Estes  <aestes@apple.com>
 

trunk/Source/WTF/wtf/Assertions.h

@@ -518 +518 @@
 #define RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(assertion) RELEASE_ASSERT(assertion)
 #define RELEASE_ASSERT_NOT_REACHED(...) CRASH_WITH_INFO(__VA_ARGS__)
+#define RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(assertion) do { \
+    if (UNLIKELY(!(assertion))) { \
+        CRASH_UNDER_CONSTEXPR_CONTEXT(); \
+    } \
+} while (0)
 #else
 #define RELEASE_ASSERT(assertion, ...) ASSERT(assertion, __VA_ARGS__)
@@ -523 +528 @@
 #define RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(assertion) ASSERT_WITH_SECURITY_IMPLICATION(assertion)
 #define RELEASE_ASSERT_NOT_REACHED() ASSERT_NOT_REACHED()
+#define RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(assertion) ASSERT_UNDER_CONSTEXPR_CONTEXT(assertion)
 #endif
 

trunk/Source/WTF/wtf/Optional.h

@@ -517 +517 @@
 
   constexpr T const* operator ->() const {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return dataptr();
   }
 
   OPTIONAL_MUTABLE_CONSTEXPR T* operator ->() {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return dataptr();
   }
 
   constexpr T const& operator *() const& {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return contained_val();
   }
 
   OPTIONAL_MUTABLE_CONSTEXPR T& operator *() & {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return contained_val();
   }
 
   OPTIONAL_MUTABLE_CONSTEXPR T&& operator *() && {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return detail_::constexpr_move(contained_val());
   }
 
   constexpr T const& value() const& {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return contained_val();
   }
 
   OPTIONAL_MUTABLE_CONSTEXPR T& value() & {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return contained_val();
   }
 
   OPTIONAL_MUTABLE_CONSTEXPR T&& value() && {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(initialized());
     return std::move(contained_val());
   }
@@ -662 +662 @@
   // 20.5.5.3, observers
   constexpr T* operator->() const {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(ref);
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(ref);
     return ref;
   }
 
   constexpr T& operator*() const {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(ref);
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(ref);
     return *ref;
   }
 
   constexpr T& value() const {
-    ASSERT_UNDER_CONSTEXPR_CONTEXT(ref());
+    RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(ref());
     return *ref;
   }