From a9eb25783e00a819962a7f2b5755c203894de36b Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 17 Aug 2016 19:36:25 +0000
Subject: [PATCH] Vendor import of libc++ release_39 branch r278877:
 https://llvm.org/svn/llvm-project/libcxx/branches/release_39@278877

---
 include/iterator                              | 16 +++---
 .../last_write_time.pass.cpp                  |  3 +-
 .../iterator.range/begin-end.fail.cpp         | 51 +++++++++++++++++++
 .../complex.transcendentals/asin.pass.cpp     |  1 -
 4 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 test/std/iterators/iterator.range/begin-end.fail.cpp

diff --git a/include/iterator b/include/iterator
index abd142e85aa3..0caabbb2ea1a 100644
--- a/include/iterator
+++ b/include/iterator
@@ -1632,16 +1632,16 @@ reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)
 
 template <class _Cp>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cbegin(const _Cp& __c) -> decltype(begin(__c))
+auto cbegin(const _Cp& __c) -> decltype(_VSTD::begin(__c))
 {
-    return begin(__c);
+    return _VSTD::begin(__c);
 }
 
 template <class _Cp>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cend(const _Cp& __c) -> decltype(end(__c))
+auto cend(const _Cp& __c) -> decltype(_VSTD::end(__c))
 {
-    return end(__c);
+    return _VSTD::end(__c);
 }
 
 template <class _Cp>
@@ -1674,16 +1674,16 @@ auto rend(const _Cp& __c) -> decltype(__c.rend())
 
 template <class _Cp>
 inline _LIBCPP_INLINE_VISIBILITY
-auto crbegin(const _Cp& __c) -> decltype(rbegin(__c))
+auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c))
 {
-    return rbegin(__c);
+    return _VSTD::rbegin(__c);
 }
 
 template <class _Cp>
 inline _LIBCPP_INLINE_VISIBILITY
-auto crend(const _Cp& __c) -> decltype(rend(__c))
+auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))
 {
-    return rend(__c);
+    return _VSTD::rend(__c);
 }
 
 #endif
diff --git a/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp b/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
index 3c61b26d18e0..50407b0399f9 100644
--- a/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
+++ b/test/std/experimental/filesystem/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp
@@ -158,7 +158,8 @@ TEST_CASE(get_last_write_time_dynamic_env_test)
 
     TEST_CHECK(ftime2 > ftime);
     TEST_CHECK(dtime2 > dtime);
-    TEST_CHECK(LastAccessTime(file) == file_access_time);
+    TEST_CHECK(LastAccessTime(file) == file_access_time ||
+               LastAccessTime(file) == Clock::to_time_t(ftime2));
     TEST_CHECK(LastAccessTime(dir) == dir_access_time);
 }
 
diff --git a/test/std/iterators/iterator.range/begin-end.fail.cpp b/test/std/iterators/iterator.range/begin-end.fail.cpp
new file mode 100644
index 000000000000..1a1493099664
--- /dev/null
+++ b/test/std/iterators/iterator.range/begin-end.fail.cpp
@@ -0,0 +1,51 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "test_macros.h"
+
+#if TEST_STD_VER < 11
+#error
+#else
+
+// <iterator>
+// template <class C> auto begin(C& c) -> decltype(c.begin());
+// template <class C> auto begin(const C& c) -> decltype(c.begin());
+// template <class C> auto end(C& c) -> decltype(c.end());
+// template <class C> auto end(const C& c) -> decltype(c.end());
+// template <class E> reverse_iterator<const E*> rbegin(initializer_list<E> il);
+// template <class E> reverse_iterator<const E*> rend(initializer_list<E> il);
+
+
+#include <iterator>
+#include <cassert>
+
+namespace Foo {
+	struct FakeContainer {};
+	typedef int FakeIter;
+
+	FakeIter begin(const FakeContainer &)   { return 1; }
+	FakeIter end  (const FakeContainer &)   { return 2; }
+	FakeIter rbegin(const FakeContainer &)  { return 3; }
+	FakeIter rend  (const FakeContainer &)  { return 4; }
+
+	FakeIter cbegin(const FakeContainer &)  { return 11; }
+	FakeIter cend  (const FakeContainer &)  { return 12; }
+	FakeIter crbegin(const FakeContainer &) { return 13; }
+	FakeIter crend  (const FakeContainer &) { return 14; }
+}
+	
+
+int main(){
+// Bug #28927 - shouldn't find these via ADL
+	(void) std::cbegin (Foo::FakeContainer());
+	(void) std::cend   (Foo::FakeContainer());
+	(void) std::crbegin(Foo::FakeContainer());
+	(void) std::crend  (Foo::FakeContainer());	
+}
+#endif
diff --git a/test/std/numerics/complex.number/complex.transcendentals/asin.pass.cpp b/test/std/numerics/complex.number/complex.transcendentals/asin.pass.cpp
index cf6f7869bd1a..2b213094df25 100644
--- a/test/std/numerics/complex.number/complex.transcendentals/asin.pass.cpp
+++ b/test/std/numerics/complex.number/complex.transcendentals/asin.pass.cpp
@@ -91,7 +91,6 @@ void test_edges()
         {
             assert(std::isnan(r.real()));
             assert(std::isnan(r.imag()));
-            assert(std::signbit(testcases[i].imag()) == std::signbit(r.imag()));
         }
         else if (std::isnan(testcases[i].real()) && std::isinf(testcases[i].imag()))
         {