[libcxx] r265706 - Recommit r263036 with additional inlining, so that it will continue to work with existing system dylibs. Implements LWG#2583

[Marshall Clow via cfe-commits]

Author: marshall
Date: Thu Apr  7 13:13:41 2016
New Revision: 265706

URL: http://llvm.org/viewvc/llvm-project?rev=265706&view=rev
Log:
Recommit r263036 with additional inlining, so that it will continue to work with existing system dylibs. Implements LWG#2583

Modified:
    libcxx/trunk/include/string
    libcxx/trunk/test/std/strings/basic.string/string.cons/substr.pass.cpp

Modified: libcxx/trunk/include/string
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?rev=265706&r1=265705&r2=265706&view=diff
==============================================================================
--- libcxx/trunk/include/string (original)
+++ libcxx/trunk/include/string Thu Apr  7 13:13:41 2016
@@ -98,8 +98,10 @@ public:
     basic_string(const basic_string& str);
     basic_string(basic_string&& str)
         noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    basic_string(const basic_string& str, size_type pos, size_type n = npos,
+    basic_string(const basic_string& str, size_type pos,
                  const allocator_type& a = allocator_type());
+    basic_string(const basic_string& str, size_type pos, size_type n,
+                 const Allocator& a = Allocator());             
     basic_string(const value_type* s, const allocator_type& a = allocator_type());
     basic_string(const value_type* s, size_type n, const allocator_type& a = allocator_type());
     basic_string(size_type n, value_type c, const allocator_type& a = allocator_type());
@@ -1397,7 +1399,10 @@ public:
     basic_string(size_type __n, value_type __c);
     _LIBCPP_INLINE_VISIBILITY
     basic_string(size_type __n, value_type __c, const allocator_type& __a);
-    basic_string(const basic_string& __str, size_type __pos, size_type __n = npos,
+    basic_string(const basic_string& __str, size_type __pos, size_type __n,
+                 const allocator_type& __a = allocator_type());
+    _LIBCPP_INLINE_VISIBILITY
+    basic_string(const basic_string& __str, size_type __pos,
                  const allocator_type& __a = allocator_type());
     template<class _InputIterator>
         _LIBCPP_INLINE_VISIBILITY
@@ -2220,6 +2225,21 @@ basic_string<_CharT, _Traits, _Allocator
 #if _LIBCPP_DEBUG_LEVEL >= 2
     __get_db()->__insert_c(this);
 #endif
+}
+
+template <class _CharT, class _Traits, class _Allocator>
+inline _LIBCPP_INLINE_VISIBILITY
+basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, size_type __pos,
+                                                        const allocator_type& __a)
+    : __r_(__a)
+{
+    size_type __str_sz = __str.size();
+    if (__pos > __str_sz)
+        this->__throw_out_of_range();
+    __init(__str.data() + __pos, __str_sz - __pos);
+#if _LIBCPP_DEBUG_LEVEL >= 2
+    __get_db()->__insert_c(this);
+#endif
 }
 
 template <class _CharT, class _Traits, class _Allocator>

Modified: libcxx/trunk/test/std/strings/basic.string/string.cons/substr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/substr.pass.cpp?rev=265706&r1=265705&r2=265706&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/basic.string/string.cons/substr.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/basic.string/string.cons/substr.pass.cpp Thu Apr  7 13:13:41 2016
@@ -11,14 +11,21 @@
 // <string>
 
 // basic_string(const basic_string<charT,traits,Allocator>& str,
-//              size_type pos, size_type n = npos,
+//              size_type pos, size_type n,
+//              const Allocator& a = Allocator());
+//
+// basic_string(const basic_string<charT,traits,Allocator>& str,
+//              size_type pos,
 //              const Allocator& a = Allocator());
 
 #include <string>
 #include <stdexcept>
 #include <algorithm>
+#include <vector>
+#include <scoped_allocator>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
 
@@ -91,6 +98,20 @@ test(S str, unsigned pos, unsigned n, co
     }
 }
 
+#if TEST_STD_VER >= 11
+void test2583()
+{   // LWG #2583
+    typedef std::basic_string<char, std::char_traits<char>, test_allocator<char> > StringA;
+    std::vector<StringA, std::scoped_allocator_adaptor<test_allocator<StringA>>> vs;
+    StringA s{"1234"};
+    vs.emplace_back(s, 2);
+
+    try { vs.emplace_back(s, 5); }
+    catch (const std::out_of_range&) { return; }
+    assert(false);
+}
+#endif
+
 int main()
 {
     {
@@ -131,7 +152,7 @@ int main()
     test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 10, A(8));
     test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 100, A(8));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef min_allocator<char> A;
     typedef std::basic_string<char, std::char_traits<char>, A> S;
@@ -170,5 +191,7 @@ int main()
     test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 10, A());
     test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 100, A());
     }
+
+    test2583();
 #endif
 }