summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-02-07 21:30:17 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-02-07 21:30:17 +0000
commitfc940277cba00b3a023c8c0f15360df73319c2a4 (patch)
tree2ade6d9b28e9eb75e3f008d825a7e628102a2544 /libcxx/test/std/strings/basic.string
parentce26819f9e673c844d82f5394b660fd3572d8a7d (diff)
downloadbcm5719-llvm-fc940277cba00b3a023c8c0f15360df73319c2a4.tar.gz
bcm5719-llvm-fc940277cba00b3a023c8c0f15360df73319c2a4.zip
Fix PR#31454 - 'basic_string<T>::push_back() crashes if sizeof(T)>sizeof(long long)'. We were mishandling the small-string optimization calculations for very large 'characters'. This may be an ABI change (change the size of) strings of very large 'characters', but since they never worked, I'm not too concerned.
llvm-svn: 324531
Diffstat (limited to 'libcxx/test/std/strings/basic.string')
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
index 5ca5aaf8629..128446534e8 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
@@ -48,7 +48,7 @@ int main()
test(S("12345678901234567890"), 'a', S("12345678901234567890a"));
}
#endif
-#if 0
+
{
// https://bugs.llvm.org/show_bug.cgi?id=31454
std::basic_string<veryLarge> s;
@@ -57,5 +57,4 @@ int main()
s.push_back(vl);
s.push_back(vl);
}
-#endif
}
OpenPOWER on IntegriCloud