[libcxx-commits] [PATCH] D81973: [libcxx/variant] Fix build error for when exceptions disabled.

[Michael Park via Phabricator via libcxx-commits]

mpark updated this revision to Diff 271241.
mpark added a comment.

Added a comment.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D81973/new/

https://reviews.llvm.org/D81973

Files:
  libcxx/include/variant


Index: libcxx/include/variant
===================================================================
--- libcxx/include/variant
+++ libcxx/include/variant
@@ -1062,14 +1062,9 @@
         _VSTD::swap(__lhs, __rhs);
       }
       __impl __tmp(_VSTD::move(*__rhs));
-      static constexpr bool __is_noexcept =
-#ifdef _LIBCPP_NO_EXCEPTIONS
-          true;
-#else
-          __all<(is_nothrow_move_constructible_v<_Types> &&
-                 is_nothrow_swappable_v<_Types>)...>::value;
-#endif
-      if constexpr (__is_noexcept) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+      if constexpr (__all<(is_nothrow_move_constructible_v<_Types> &&
+                           is_nothrow_swappable_v<_Types>)...>::value) {
         this->__generic_construct(*__rhs, _VSTD::move(*__lhs));
       } else {
         // EXTENSION: When the move construction of `__lhs` into `__rhs` throws
@@ -1084,6 +1079,11 @@
           throw;
         }
       }
+#else
+      // this isn't consolidated with the `if constexpr` branch above due to
+      // `throw` being ill-formed with exceptions disabled even when discarded.
+      this->__generic_construct(*__rhs, _VSTD::move(*__lhs));
+#endif
       this->__generic_construct(*__lhs, _VSTD::move(__tmp));
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81973.271241.patch
Type: text/x-patch
Size: 1240 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200616/03969ce0/attachment.bin>