Merge commit '13410fa79ff0' from llvm.org/master into apple/main

Author: git apple-llvm automerger

libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// REQUIRES: asan
+
 // <vector>
 
 // reference operator[](size_type n);
@@ -19,7 +21,6 @@
 #include "test_iterators.h"
 #include "test_macros.h"
 
-#ifndef _LIBCPP_HAS_NO_ASAN
 extern "C" void __sanitizer_set_death_callback(void (*callback)(void));
 
 void do_exit() {
@@ -65,6 +66,3 @@ int main(int, char**)
         ((void)foo);
     }
 }
-#else
-int main(int, char**) { return 0; }
-#endif

libcxx/test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++03, c++11
+
 // <iomanip>
 
 // quoted
@@ -17,9 +19,6 @@
 
 #include "test_macros.h"
 
-#if TEST_STD_VER > 11
-// quoted is C++14 only
-
 bool is_skipws ( const std::istream *is ) {
     return ( is->flags() & std::ios_base::skipws ) != 0;
     }
@@ -210,8 +209,3 @@ int main(int, char**)
 
     return 0;
 }
-#else
-int main(int, char**) {
-  return 0;
-}
-#endif

libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.compile.fail.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++03, c++11
+
 // <utility>
 
 // template<class T, T... I>
@@ -23,19 +25,9 @@
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-#if TEST_STD_VER > 11
-
-//  Should fail to compile, since float is not an integral type
+int main(int, char**) {
+    // Should fail to compile, since float is not an integral type
     using floatmix = std::integer_sequence<float>;
     floatmix::value_type I;
-
-#else
-
-X
-
-#endif  // TEST_STD_VER > 11
-
-  return 0;
+    return 0;
 }