From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 15 Nov 2016 05:03:22 +0000 (+0000)
Subject: Missed one of the try blocks the first time :-(. Thanks to Renato for the heads up.
X-Git-Tag: llvmorg-4.0.0-rc1~4572
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7182fe464c792b937c7862a98d6c4ad6a95d416;p=platform%2Fupstream%2Fllvm.git

Missed one of the try blocks the first time :-(. Thanks to Renato for the heads up.

llvm-svn: 286932
---

diff --git a/libcxx/test/std/strings/basic.string/string.cons/T_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/T_size_size.pass.cpp
index 144a1ab..0b75a6c 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/T_size_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/T_size_size.pass.cpp
@@ -64,7 +64,7 @@ test(SV sv, unsigned pos, unsigned n, const typename S::allocator_type& a)
 {
     typedef typename S::traits_type T;
     typedef typename S::allocator_type A;
-    try
+    if (pos <= sv.size())
     {
         S s2(sv, pos, n, a);
         LIBCPP_ASSERT(s2.__invariants());
@@ -75,10 +75,20 @@ test(SV sv, unsigned pos, unsigned n, const typename S::allocator_type& a)
         assert(s2.get_allocator() == a);
         assert(s2.capacity() >= s2.size());
     }
-    catch (std::out_of_range&)
+#ifndef TEST_HAS_NO_EXCEPTIONS
+    else
     {
-        assert(pos > sv.size());
+        try
+        {
+            S s2(sv, pos, n, a);
+            assert(false);
+        }
+        catch (std::out_of_range&)
+        {
+            assert(pos > sv.size());
+        }
     }
+#endif
 }
 
 int main()