Merge commit '8b828e983868' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit a0e3ed008c17 · 2020-06-12T14:54:51.000-07:00
diff --git a/libcxx/test/std/containers/sequences/array/at.pass.cpp b/libcxx/test/std/containers/sequences/array/at.pass.cpp
@@ -77,7 +77,8 @@ void test_exceptions()
         }
 
         try {
-            TEST_IGNORE_NODISCARD array.at(-1);
+            using size_type = decltype(array)::size_type;
+            TEST_IGNORE_NODISCARD array.at(static_cast<size_type>(-1));
             assert(false);
         } catch (std::out_of_range const&) {
             // pass
diff --git a/libcxx/test/std/containers/sequences/array/at_const.pass.cpp b/libcxx/test/std/containers/sequences/array/at_const.pass.cpp
@@ -73,7 +73,8 @@ void test_exceptions()
         }
 
         try {
-            TEST_IGNORE_NODISCARD array.at(-1);
+            using size_type = decltype(array)::size_type;
+            TEST_IGNORE_NODISCARD array.at(static_cast<size_type>(-1));
             assert(false);
         } catch (std::out_of_range const&) {
             // pass

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ void test_exceptions()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`try {`
`80`		`- TEST_IGNORE_NODISCARD array.at(-1);`
	`80`	`+ using size_type = decltype(array)::size_type;`
	`81`	`+ TEST_IGNORE_NODISCARD array.at(static_cast<size_type>(-1));`
`81`	`82`	`assert(false);`
`82`	`83`	`} catch (std::out_of_range const&) {`
`83`	`84`	`// pass`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ void test_exceptions()`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`try {`
`76`		`- TEST_IGNORE_NODISCARD array.at(-1);`
	`76`	`+ using size_type = decltype(array)::size_type;`
	`77`	`+ TEST_IGNORE_NODISCARD array.at(static_cast<size_type>(-1));`
`77`	`78`	`assert(false);`
`78`	`79`	`} catch (std::out_of_range const&) {`
`79`	`80`	`// pass`