[libc++] Fix chrono::duration constructor constraint

[ldionne]

Summary

As per [time.duration.cons]/1 the constructor constraint should be on
const Rep2&. As it is now the code will fail to compile in certain
cases, ex:

https://godbolt.org/z/c7fPrcTYM

struct S{
operator int() const&& noexcept = delete;
operator int() const& noexcept;
};

const S &fun();

auto k = std::chrono::microseconds{fun()};

[ldionne]

Thanks for your patch!

Can you please add a test for this? The correct file seems like it should be libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp.

Also, if you need someone to commit this for you, please provide Author Name <email@domain> for commit attribution.

[tiagoma]

In D118902#3293588, @ldionne wrote:

Thanks for your patch!

Can you please add a test for this? The correct file seems like it should be libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp.

Also, if you need someone to commit this for you, please provide Author Name <email@domain> for commit attribution.

"Tiago Macarios <[e-mail]>"

[ldionne]

Commandeer per offline discussion.

[ldionne]

Fix the test.

libcxx/include/__chrono/duration.h

#else
         duration() {}
 #endif
 
     template <class _Rep2>
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
         explicit duration(const _Rep2& __r,
             typename enable_if
             <
-               is_convertible<_Rep2, rep>::value &&
+               is_convertible<const _Rep2&, rep>::value &&
                (treat_as_floating_point<rep>::value ||
                !treat_as_floating_point<_Rep2>::value)
             >::type* = nullptr)
                 : __rep_(__r) {}
 
     // conversions
     template <class _Rep2, class _Period2>
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR

libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp

 
 #include <chrono>
 #include <cassert>
 #include <ratio>
 
 #include "test_macros.h"
 #include "../../rep.h"
 
+#if TEST_STD_VER >= 11
+struct NotValueConvertible {
+    operator int() const&& = delete;
+    constexpr operator int() const& { return 1; }
+};
+#endif
+
 template <class D, class R>
-void
-test(R r)
-{
+TEST_CONSTEXPR_CXX14 void check(R r) {
     D d(r);
     assert(d.count() == r);
+}
+
+TEST_CONSTEXPR_CXX14 bool test() {
+    check<std::chrono::duration<int> >(5);
+    check<std::chrono::duration<int, std::ratio<3, 2> > >(5);
+    check<std::chrono::duration<Rep, std::ratio<3, 2> > >(Rep(3));
+    check<std::chrono::duration<double, std::ratio<2, 3> > >(5.5);
+
+    // test for [time.duration.cons]/1
 #if TEST_STD_VER >= 11
-    constexpr D d2(R(2));
-    static_assert(d2.count() == 2, "");
+    check<std::chrono::duration<int> >(NotValueConvertible());
 #endif
+
+    return true;
 }
 
-int main(int, char**)
-{
-    test<std::chrono::duration<int> >(5);
-    test<std::chrono::duration<int, std::ratio<3, 2> > >(5);
-    test<std::chrono::duration<Rep, std::ratio<3, 2> > >(Rep(3));
-    test<std::chrono::duration<double, std::ratio<2, 3> > >(5.5);
+int main(int, char**) {
+    test();
+#if TEST_STD_VER > 11
+    static_assert(test(), "");
+#endif
 
+    // Basic test for constexpr-friendliness in C++11
+#if TEST_STD_VER >= 11
+    {
+        constexpr std::chrono::duration<int> d(5);
+        static_assert(d.count() == 5, "");
+    }
+#endif
     return 0;
 }