Support tests in freestanding
Summary:
Freestanding is *weird*. The standard allows it to differ in a bunch of odd
manners from regular C++, and the committee would like to improve that
situation. I'd like to make libc++ behave better with what freestanding should
be, so that it can be a tool we use in improving the standard. To do that we
need to try stuff out, both with "freestanding the language mode" and
"freestanding the library subset".
Let's start with the super basic: run the libc++ tests in freestanding, using
clang as the compiler, and see what works. The easiest hack to do this:
In utils/libcxx/test/config.py add:
self.cxx.compile_flags += ['-ffreestanding']
Run the tests and they all fail.
Why? Because in freestanding `main` isn't special. This "not special" property
has two effects: main doesn't get mangled, and main isn't allowed to omit its
`return` statement. The first means main gets mangled and the linker can't
create a valid executable for us to test. The second means we spew out warnings
(ew) and the compiler doesn't insert the `return` we omitted, and main just
falls of the end and does whatever undefined behavior (if you're luck, ud2
leading to non-zero return code).
Let's start my work with the basics. This patch changes all libc++ tests to
declare `main` as `int main(int, char**` so it mangles consistently (enabling us
to declare another `extern "C"` main for freestanding which calls the mangled
one), and adds `return 0;` to all places where it was missing. This touches 6124
files, and I apologize.
The former was done with The Magic Of Sed.
The later was done with a (not quite correct but decent) clang tool:
https://gist.github.com/jfbastien/793819ff360baa845483dde81170feed
This works for most tests, though I did have to adjust a few places when e.g.
the test runs with `-x c`, macros are used for main (such as for the filesystem
tests), etc.
Once this is in we can create a freestanding bot which will prevent further
regressions. After that, we can start the real work of supporting C++
freestanding fairly well in libc++.
<rdar://problem/47754795>
Reviewers: ldionne, mclow.lists, EricWF
Subscribers: christof, jkorous, dexonsmith, arphaman, miyuki, libcxx-commits
Differential Revision: https://reviews.llvm.org/D57624
llvm-svn: 353086
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 4f8158ea..3872597 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
@@ -91,7 +91,7 @@
#endif
}
-int main()
+int main(int, char**)
{
{
@@ -183,4 +183,6 @@
S s7(s.data(), 2); // calls ctor(const char *, len)
assert(s7 == "AB");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp
index a2518a1..765f61e 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp
@@ -85,11 +85,13 @@
#endif
-int main()
+int main(int, char**)
{
test<std::basic_string<char, std::char_traits<char>, test_allocator<char> > >();
#if TEST_STD_VER >= 11
test2<std::basic_string<char, std::char_traits<char>, min_allocator<char> > >();
test2<std::basic_string<char, std::char_traits<char>, explicit_allocator<char> > >();
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/brace_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/brace_assignment.pass.cpp
index 44db3c1..5e77e46 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/brace_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/brace_assignment.pass.cpp
@@ -18,7 +18,7 @@
#include "test_macros.h"
-int main()
+int main(int, char**)
{
// Test that assignment from {} and {ptr, len} are allowed and are not
// ambiguous.
@@ -32,4 +32,6 @@
s = {"abc", 2};
assert(s == "ab");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/char_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/char_assignment.pass.cpp
index e3976cf..53f676e 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/char_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/char_assignment.pass.cpp
@@ -28,7 +28,7 @@
assert(s1.capacity() >= s1.size());
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -46,4 +46,6 @@
test(S("1234567890123456789012345678901234567890123456789012345678901234567890"), 'a');
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/copy.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/copy.pass.cpp
index f2cfa8a..0024f2d 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/copy.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/copy.pass.cpp
@@ -28,7 +28,7 @@
assert(s2.get_allocator() == s1.get_allocator());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -46,4 +46,6 @@
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()));
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
index 57a17e8..a635f01 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/copy_alloc.pass.cpp
@@ -87,7 +87,7 @@
assert(s2.get_allocator() == a);
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -127,4 +127,6 @@
}
#endif
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/copy_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/copy_assignment.pass.cpp
index a3c1389..8b3b7ac 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/copy_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/copy_assignment.pass.cpp
@@ -27,7 +27,7 @@
assert(s1.capacity() >= s1.size());
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -76,4 +76,6 @@
assert(s == "a");
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
index 1ab00b6..301876b 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include "test_macros.h"
#include "test_allocator.h"
-int main()
+int main(int, char**)
{
{
typedef std::string C;
@@ -35,4 +35,6 @@
typedef std::basic_string<char, std::char_traits<char>, limited_allocator<char, 10>> C;
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
index 5b57fe3..d1372d2 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
@@ -32,7 +32,7 @@
std::string s;
std::wstring ws;
-int main()
+int main(int, char**)
{
{
typedef std::string C;
@@ -48,4 +48,6 @@
static_assert(!std::is_nothrow_destructible<C>::value, "");
}
#endif // _LIBCPP_VERSION
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
index 7eb364e..9e31d3e 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
@@ -46,7 +46,7 @@
// (13) basic_string(initializer_list<CharT>, A const& = A())
// (14) basic_string(BSV, A const& = A())
// (15) basic_string(const T&, size_type, size_type, A const& = A())
-int main()
+int main(int, char**)
{
using TestSizeT = test_allocator<char>::size_type;
{ // Testing (1)
@@ -313,4 +313,6 @@
ASSERT_SAME_TYPE(decltype(w), ExpectW);
assert(w == L"cd");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/initializer_list.pass.cpp
index 3a8914c..a106203 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/initializer_list.pass.cpp
@@ -18,7 +18,7 @@
#include "test_allocator.h"
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
std::string s = {'a', 'b', 'c'};
@@ -40,4 +40,6 @@
s = {L'a', L'b', L'c'};
assert(s == L"abc");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
index 6a512f2..dcb9bb9 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
@@ -17,7 +17,7 @@
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
std::string s;
@@ -30,4 +30,6 @@
s = {'a', 'b', 'c'};
assert(s == "abc");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
index 6966e6e..042018c 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -56,7 +56,7 @@
assert(s2.capacity() >= s2.size());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -116,4 +116,6 @@
test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A());
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp
index f87aac5..57fd550 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp
@@ -35,7 +35,7 @@
template <typename T>
struct NotAnAllocator { typedef T value_type; };
-int main()
+int main(int, char**)
{
{ // Not an iterator at all
std::basic_string s1{NotAnItertor{}, NotAnItertor{}, std::allocator<char>{}}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
@@ -52,4 +52,6 @@
std::basic_string s1{s, s+10, NotAnAllocator<wchar_t>{}}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
index dac9ee3..44daab4 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
@@ -36,7 +36,7 @@
#include "../input_iterator.h"
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
const char* s = "12345678901234";
@@ -89,4 +89,6 @@
assert(s1.size() == 10);
assert(s1.compare(0, s1.size(), s, s1.size()) == 0);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move.pass.cpp
index 1c11368..729c8e8 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/move.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/move.pass.cpp
@@ -32,7 +32,7 @@
assert(s2.get_allocator() == s1.get_allocator());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -48,4 +48,6 @@
test(S("1", A()));
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()));
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp
index e426e2d..63e349e 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp
@@ -34,7 +34,7 @@
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -74,4 +74,6 @@
test(S("1"), A());
test(S("1234567890123456789012345678901234567890123456789012345678901234567890"), A());
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
index 88bc123..2a00898 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
@@ -62,7 +62,7 @@
typedef std::false_type is_always_equal;
};
-int main()
+int main(int, char**)
{
{
typedef std::string C;
@@ -93,4 +93,6 @@
static_assert(!std::is_nothrow_move_assignable<C>::value, "");
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_assignment.pass.cpp
index b039e79..9684fe7 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/move_assignment.pass.cpp
@@ -32,7 +32,7 @@
assert(s1.capacity() >= s1.size());
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -70,4 +70,6 @@
"1234567890123456789012345678901234567890123456789012345678901234567890"),
S("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"));
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp
index 374183f..ee839cf 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include "test_macros.h"
#include "test_allocator.h"
-int main()
+int main(int, char**)
{
{
typedef std::string C;
@@ -39,4 +39,6 @@
static_assert( std::is_nothrow_move_constructible<C>::value, "");
#endif
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index b68c522..d67f123 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp
@@ -51,7 +51,7 @@
assert(s2.capacity() >= s2.size());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -85,4 +85,6 @@
test("123456798012345679801234567980123456798012345679801234567980", A());
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/pointer_assignment.pass.cpp
index 1216f3f..4a88548 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/pointer_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/pointer_assignment.pass.cpp
@@ -29,7 +29,7 @@
assert(s1.capacity() >= s1.size());
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -69,4 +69,6 @@
"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
index 9645713..75ad883 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
@@ -48,7 +48,7 @@
assert(s2.capacity() >= s2.size());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -90,4 +90,6 @@
assert(s == "a");
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp
index 21ed485..d509971 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp
@@ -80,7 +80,7 @@
assert(s2.capacity() >= s2.size());
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -120,4 +120,6 @@
test(static_cast<char>(100), static_cast<char>(65), A());
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp
index d7a0540..61d5b3d 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp
@@ -15,8 +15,10 @@
void foo ( const string &s ) {}
-int main()
+int main(int, char**)
{
std::string_view sv = "ABCDE";
foo(sv); // requires implicit conversion from string_view to string
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view.pass.cpp
index f50d9e5..b423c32 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view.pass.cpp
@@ -71,7 +71,7 @@
}
}
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -107,4 +107,6 @@
test(SV("123456798012345679801234567980123456798012345679801234567980"), A());
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_assignment.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_assignment.pass.cpp
index 9a50f62..942d990 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view_assignment.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view_assignment.pass.cpp
@@ -28,7 +28,7 @@
assert(s1.capacity() >= s1.size());
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -70,4 +70,6 @@
SV("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"));
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.fail.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.fail.cpp
index 23e6668..62ce16e 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.fail.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.fail.cpp
@@ -31,10 +31,12 @@
#include <cassert>
#include <cstddef>
-int main()
+int main(int, char**)
{
{
std::string_view sv = "12345678901234";
std::basic_string s1{sv, 23}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp
index ee73158..b3adc41 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp
@@ -38,7 +38,7 @@
#include "../input_iterator.h"
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
std::string_view sv = "12345678901234";
@@ -103,4 +103,6 @@
assert(s1.size() == sv.size());
assert(s1.compare(0, s1.size(), sv.data(), s1.size()) == 0);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.fail.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.fail.cpp
index ce4e695..cff6056 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.fail.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.fail.cpp
@@ -37,10 +37,12 @@
#include <cassert>
#include <cstddef>
-int main()
+int main(int, char**)
{
{
std::string_view sv = "12345678901234";
std::basic_string s1{sv, 0, 4, 23}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp
index daba3bd..983ab78 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp
@@ -42,7 +42,7 @@
#include "../input_iterator.h"
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
std::string_view sv = "12345678901234";
@@ -107,4 +107,6 @@
assert(s1.size() == 4);
assert(s1.compare(0, s1.size(), sv.data(), s1.size()) == 0);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/substr.pass.cpp
index 05c53ac..44f29be 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/substr.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/substr.pass.cpp
@@ -140,7 +140,7 @@
#endif
#endif
-int main()
+int main(int, char**)
{
{
typedef test_allocator<char> A;
@@ -224,4 +224,6 @@
test2583();
#endif
#endif
+
+ return 0;
}