[libcxx-commits] [PATCH] D138069: [libc++] Don't pass the allocator in substr()

[Nikolas Klauser via Phabricator via libcxx-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGad79455fad9f: [libc++] Don't pass the allocator in substr() (authored by philnik).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D138069/new/

https://reviews.llvm.org/D138069

Files:
  libcxx/include/string
  libcxx/test/std/strings/basic.string/string.ops/string_substr/substr.pass.cpp


Index: libcxx/test/std/strings/basic.string/string.ops/string_substr/substr.pass.cpp
===================================================================
--- libcxx/test/std/strings/basic.string/string.ops/string_substr/substr.pass.cpp
+++ libcxx/test/std/strings/basic.string/string.ops/string_substr/substr.pass.cpp
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
+#include "test_allocator.h"
 #include "test_macros.h"
 #include "min_allocator.h"
 
@@ -119,11 +120,37 @@
   return true;
 }
 
+TEST_CONSTEXPR_CXX20 bool test_alloc() {
+  {
+    using alloc  = test_allocator<char>;
+    using string = std::basic_string<char, std::char_traits<char>, alloc>;
+    test_allocator_statistics stats;
+    {
+      string str((alloc(&stats)));
+      stats = test_allocator_statistics();
+      (void)str.substr();
+      assert(stats.moved == 0);
+      assert(stats.copied == 0);
+    }
+    {
+      string str((alloc(&stats)));
+      stats = test_allocator_statistics();
+      (void)std::move(str).substr();
+      assert(stats.moved == 0);
+      assert(stats.copied == 0);
+    }
+  }
+
+  return true;
+}
+
 int main(int, char**)
 {
   test();
+  test_alloc();
 #if TEST_STD_VER > 17
   static_assert(test());
+  static_assert(test_alloc());
 #endif
 
   return 0;
Index: libcxx/include/string
===================================================================
--- libcxx/include/string
+++ libcxx/include/string
@@ -1430,21 +1430,20 @@
 
     _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type copy(value_type* __s, size_type __n, size_type __pos = 0) const;
 
-    // TODO: Maybe don't pass in the allocator. See https://llvm.org/PR57190
 #if _LIBCPP_STD_VER <= 20
     _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
     basic_string substr(size_type __pos = 0, size_type __n = npos) const {
-      return basic_string(*this, __pos, __n, __alloc());
+      return basic_string(*this, __pos, __n);
     }
 #else
     _LIBCPP_HIDE_FROM_ABI constexpr
     basic_string substr(size_type __pos = 0, size_type __n = npos) const& {
-      return basic_string(*this, __pos, __n, __alloc());
+      return basic_string(*this, __pos, __n);
     }
 
     _LIBCPP_HIDE_FROM_ABI constexpr
     basic_string substr(size_type __pos = 0, size_type __n = npos) && {
-      return basic_string(std::move(*this), __pos, __n, __alloc());
+      return basic_string(std::move(*this), __pos, __n);
     }
 #endif
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D138069.478636.patch
Type: text/x-patch
Size: 2409 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20221129/85c041a2/attachment-0001.bin>