[PATCH] D41048: [libcxx] workaround PR 28385 in __find_exactly_one_checked

[Casey Carter via Phabricator via cfe-commits]

CaseyCarter updated this revision to Diff 126406.
CaseyCarter added a comment.

Make the workaround unconditional.


https://reviews.llvm.org/D41048

Files:
  include/tuple


Index: include/tuple
===================================================================
--- include/tuple
+++ include/tuple
@@ -1012,10 +1012,15 @@
 
 template <class _T1, class ..._Args>
 struct __find_exactly_one_checked {
-  static constexpr bool __matches[] = {is_same<_T1, _Args>::value...};
-    static constexpr size_t value = __find_detail::__find_idx(0, __matches);
-    static_assert (value != __not_found, "type not found in type list" );
-    static_assert(value != __ambiguous,"type occurs more than once in type list");
+    inline _LIBCPP_INLINE_VISIBILITY
+    static constexpr size_t __index()
+    {
+        constexpr bool __matches[] = {is_same<_T1, _Args>::value...};
+        return __find_detail::__find_idx(0, __matches);
+    }
+    static constexpr size_t value = __index();
+    static_assert(value != __not_found, "type not found in type list" );
+    static_assert(value != __ambiguous, "type occurs more than once in type list");
 };
 
 template <class _T1>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41048.126406.patch
Type: text/x-patch
Size: 989 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171211/6b889ce8/attachment-0001.bin>