Changeset 231342 in webkit

Timestamp:

May 3, 2018 6:00:18 PM (6 years ago)

Author:

Yusuke Suzuki

Message:

Use default std::optional if it is provided
​https://bugs.webkit.org/show_bug.cgi?id=185159

Reviewed by Michael Catanzaro.

Source/WebKit:

• Shared/SandboxExtension.h:

(WebKit::SandboxExtension::Handle::decode):

• Shared/TouchBarMenuItemData.cpp:

(WebKit::TouchBarMenuItemData::decode):

Source/WTF:

• wtf/Expected.h:
• wtf/Optional.h:

Do not use <optional> for clang currently.
(WTF::valueOrCompute):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Expected.h (modified) (1 diff)
• WTF/wtf/Optional.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/SandboxExtension.h (modified) (1 diff)
• WebKit/Shared/TouchBarMenuItemData.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-05-03  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Use default std::optional if it is provided
+        https://bugs.webkit.org/show_bug.cgi?id=185159
+
+        Reviewed by Michael Catanzaro.
+
+        * wtf/Expected.h:
+        * wtf/Optional.h:
+        Do not use <optional> for clang currently.
+        (WTF::valueOrCompute):
+
 2018-05-03  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/Expected.h

@@ -574 +574 @@
 }}} // namespace std::experimental::fundamentals_v3
 
-__EXPECTED_INLINE_VARIABLE constexpr std::experimental::unexpected_t& unexpect = std::experimental::unexpect;
+__EXPECTED_INLINE_VARIABLE constexpr auto& unexpect = std::experimental::unexpect;
 template<class T, class E> using Expected = std::experimental::expected<T, E>;

trunk/Source/WTF/wtf/Optional.h

@@ -47 +47 @@
 # include <wtf/Compiler.h>
 # include <wtf/StdLibExtras.h>
+
+#if !COMPILER(MSVC) && !PLATFORM(COCOA) && __has_include(<optional>)
+# include <optional>
+#else
 
 # define TR2_OPTIONAL_REQUIRES(...) typename std::enable_if<__VA_ARGS__::value, bool>::type = false
@@ -1013 +1017 @@
 } // namespace std
 
+namespace std
+{
+  template <typename T>
+  struct hash<std::optional<T>>
+  {
+    typedef typename hash<T>::result_type result_type;
+    typedef std::optional<T> argument_type;
+
+    constexpr result_type operator()(argument_type const& arg) const {
+      return arg ? std::hash<T>{}(*arg) : result_type{};
+    }
+  };
+
+  template <typename T>
+  struct hash<std::optional<T&>>
+  {
+    typedef typename hash<T>::result_type result_type;
+    typedef std::optional<T&> argument_type;
+
+    constexpr result_type operator()(argument_type const& arg) const {
+      return arg ? std::hash<T>{}(*arg) : result_type{};
+    }
+  };
+}
+
+# undef TR2_OPTIONAL_REQUIRES
+# undef TR2_OPTIONAL_ASSERTED_EXPRESSION
+
+#endif // defined(__cpp_lib_optional)
+
 namespace WTF {
 
@@ -1027 +1061 @@
 } // namespace WTF
 
-namespace std
-{
-  template <typename T>
-  struct hash<std::optional<T>>
-  {
-    typedef typename hash<T>::result_type result_type;
-    typedef std::optional<T> argument_type;
-
-    constexpr result_type operator()(argument_type const& arg) const {
-      return arg ? std::hash<T>{}(*arg) : result_type{};
-    }
-  };
-
-  template <typename T>
-  struct hash<std::optional<T&>>
-  {
-    typedef typename hash<T>::result_type result_type;
-    typedef std::optional<T&> argument_type;
-
-    constexpr result_type operator()(argument_type const& arg) const {
-      return arg ? std::hash<T>{}(*arg) : result_type{};
-    }
-  };
-}
-
-# undef TR2_OPTIONAL_REQUIRES
-# undef TR2_OPTIONAL_ASSERTED_EXPRESSION
-
 using WTF::valueOrCompute;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-03  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Use default std::optional if it is provided
+        https://bugs.webkit.org/show_bug.cgi?id=185159
+
+        Reviewed by Michael Catanzaro.
+
+        * Shared/SandboxExtension.h:
+        (WebKit::SandboxExtension::Handle::decode):
+        * Shared/TouchBarMenuItemData.cpp:
+        (WebKit::TouchBarMenuItemData::decode):
+
 2018-05-03  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebKit/Shared/SandboxExtension.h

@@ -121 +121 @@
 inline SandboxExtension::Handle::~Handle() { }
 inline void SandboxExtension::Handle::encode(IPC::Encoder&) const { }
-inline std::optional<SandboxExtension::Handle> SandboxExtension::Handle::decode(IPC::Decoder&) { return {{ }}; }
+inline std::optional<SandboxExtension::Handle> SandboxExtension::Handle::decode(IPC::Decoder&) { return SandboxExtension::Handle { }; }
 inline SandboxExtension::HandleArray::HandleArray() { }
 inline SandboxExtension::HandleArray::~HandleArray() { }

trunk/Source/WebKit/Shared/TouchBarMenuItemData.cpp

@@ -66 +66 @@
         return std::nullopt;
     
-    return WTFMove(result);
+    return std::make_optional(WTFMove(result));
 }