Changeset 263280 in webkit

Timestamp:

Jun 19, 2020, 12:52:22 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

-Wsign-compare in isValidOptionSet
​https://bugs.webkit.org/show_bug.cgi?id=213383

Patch by Michael Catanzaro <Michael Catanzaro> on 2020-06-19
Reviewed by Darin Adler.

The OptionSet's StorageType is always unsigned, even if the enum's underlying value is not.
Match this in isValidOptionSet to avoid -Wsign-compare during validity checking.

• wtf/OptionSet.h:

(WTF::isValidOptionSet):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/OptionSet.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-06-19  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        -Wsign-compare in isValidOptionSet
+        https://bugs.webkit.org/show_bug.cgi?id=213383
+
+        Reviewed by Darin Adler.
+
+        The OptionSet's StorageType is always unsigned, even if the enum's underlying value is not.
+        Match this in isValidOptionSet to avoid -Wsign-compare during validity checking.
+
+        * wtf/OptionSet.h:
+        (WTF::isValidOptionSet):
+
 2020-06-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WTF/wtf/OptionSet.h

@@ -254 +254 @@
 WARN_UNUSED_RETURN constexpr bool isValidOptionSet(OptionSet<E> optionSet)
 {
-    auto allValidBitsValue = OptionSetValueChecker<std::underlying_type_t<E>, typename EnumTraits<E>::values>::allValidBits();
+    auto allValidBitsValue = OptionSetValueChecker<std::make_unsigned_t<std::underlying_type_t<E>>, typename EnumTraits<E>::values>::allValidBits();
     return (optionSet.toRaw() | allValidBitsValue) == allValidBitsValue;
 }