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/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
index 1585e17..cb66771 100644
--- a/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
@@ -35,11 +35,13 @@
#include <type_traits>
#include <variant>
-int main() {
+int main(int, char**) {
static_assert(std::is_base_of<std::exception, std::bad_variant_access>::value,
"");
static_assert(noexcept(std::bad_variant_access{}), "must be noexcept");
static_assert(noexcept(std::bad_variant_access{}.what()), "must be noexcept");
std::bad_variant_access ex;
assert(ex.what());
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.general/nothing_to_do.pass.cpp b/libcxx/test/std/utilities/variant/variant.general/nothing_to_do.pass.cpp
index 0c118a0..8002e55 100644
--- a/libcxx/test/std/utilities/variant/variant.general/nothing_to_do.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.general/nothing_to_do.pass.cpp
@@ -7,4 +7,6 @@
//
//===----------------------------------------------------------------------===//
-int main() {}
+int main(int, char**) {
+ return 0;
+}
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
index 505a8cb..5210c5f 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp
@@ -125,7 +125,9 @@
#endif
}
-int main() {
+int main(int, char**) {
test_const_get_if();
test_get_if();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
index 3cb0fc7..e7c9671 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp
@@ -123,7 +123,9 @@
#endif
}
-int main() {
+int main(int, char**) {
test_const_get_if();
test_get_if();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
index a5a629a..5519c42 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
@@ -285,10 +285,12 @@
#endif
}
-int main() {
+int main(int, char**) {
test_const_lvalue_get();
test_lvalue_get();
test_rvalue_get();
test_const_rvalue_get();
test_throws_for_all_value_categories();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
index b4cae10..76bbbb0 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
@@ -285,10 +285,12 @@
#endif
}
-int main() {
+int main(int, char**) {
test_const_lvalue_get();
test_lvalue_get();
test_rvalue_get();
test_const_rvalue_get();
test_throws_for_all_value_categories();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.get/holds_alternative.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/holds_alternative.pass.cpp
index 3e9cfbe..b374620 100644
--- a/libcxx/test/std/utilities/variant/variant.get/holds_alternative.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/holds_alternative.pass.cpp
@@ -17,7 +17,7 @@
#include "test_macros.h"
#include <variant>
-int main() {
+int main(int, char**) {
{
using V = std::variant<int>;
constexpr V v;
@@ -34,4 +34,6 @@
const V v;
ASSERT_NOEXCEPT(std::holds_alternative<int>(v));
}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
index 404f3e7..7e9ffbf 100644
--- a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
-int main() {
+int main(int, char**) {
test_library_hash_specializations_available();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp b/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
index 5acf168..edda8d2 100644
--- a/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp
@@ -150,9 +150,11 @@
}
}
-int main() {
+int main(int, char**) {
test_hash_variant();
test_hash_variant_duplicate_elements();
test_hash_monostate();
test_hash_variant_enabled();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp
index f7db0d8..48d5e14 100644
--- a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp
@@ -25,7 +25,9 @@
#include <type_traits>
#include <variant>
-int main() {
+int main(int, char**) {
using V = std::variant<int, void *, const void *, long double>;
std::variant_alternative<4, V>::type foo; // expected-error@variant:* {{Index out of bounds in std::variant_alternative<>}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
index 841f65c..7db07b6 100644
--- a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp
@@ -55,7 +55,7 @@
"");
}
-int main() {
+int main(int, char**) {
{
using V = std::variant<int, void *, const void *, long double>;
test<V, 0, int>();
@@ -73,4 +73,6 @@
test<V, 4, long double>();
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
index f7e200b..fb027fb 100644
--- a/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
@@ -36,8 +36,10 @@
"");
};
-int main() {
+int main(int, char**) {
test<std::variant<>, 0>();
test<std::variant<void *>, 1>();
test<std::variant<long, long, void *, double>, 4>();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.monostate.relops/relops.pass.cpp b/libcxx/test/std/utilities/variant/variant.monostate.relops/relops.pass.cpp
index 2df4b2b..255f6d0 100644
--- a/libcxx/test/std/utilities/variant/variant.monostate.relops/relops.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.monostate.relops/relops.pass.cpp
@@ -23,7 +23,7 @@
#include <type_traits>
#include <variant>
-int main() {
+int main(int, char**) {
using M = std::monostate;
constexpr M m1{};
constexpr M m2{};
@@ -51,4 +51,6 @@
static_assert((m1 != m2) == false, "");
ASSERT_NOEXCEPT(m1 != m2);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp b/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
index 1d7bcac..1ba75a7 100644
--- a/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
@@ -16,7 +16,7 @@
#include <type_traits>
#include <variant>
-int main() {
+int main(int, char**) {
using M = std::monostate;
static_assert(std::is_trivially_default_constructible<M>::value, "");
static_assert(std::is_trivially_copy_constructible<M>::value, "");
@@ -24,4 +24,6 @@
static_assert(std::is_trivially_destructible<M>::value, "");
constexpr M m{};
((void)m);
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.relops/relops.pass.cpp b/libcxx/test/std/utilities/variant/variant.relops/relops.pass.cpp
index 1950b5a..ed32215 100644
--- a/libcxx/test/std/utilities/variant/variant.relops/relops.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.relops/relops.pass.cpp
@@ -269,7 +269,9 @@
#endif
}
-int main() {
+int main(int, char**) {
test_equality();
test_relational();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp b/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp
index d03a6b5..e468934 100644
--- a/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp
@@ -72,7 +72,7 @@
}
-int main() {
+int main(int, char**) {
using V = std::variant<int, ComparesToMyBoolExplicit>;
V v1(42);
V v2(101);
@@ -84,4 +84,6 @@
(void)(v1 <= v2); // expected-note {{here}}
(void)(v1 > v2); // expected-note {{here}}
(void)(v1 >= v2); // expected-note {{here}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp b/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
index aadda7e..310b698 100644
--- a/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
@@ -15,6 +15,8 @@
#include <variant>
-int main() {
+int main(int, char**) {
static_assert(std::variant_npos == static_cast<std::size_t>(-1), "");
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
index 67deb3f..6a4bb04 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
@@ -254,10 +254,12 @@
#endif // TEST_HAS_NO_EXCEPTIONS
}
-int main() {
+int main(int, char**) {
test_T_assignment_basic();
test_T_assignment_performs_construction();
test_T_assignment_performs_assignment();
test_T_assignment_noexcept();
test_T_assignment_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
index 6a59989..c36375c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
@@ -590,7 +590,7 @@
#endif // > C++17
}
-int main() {
+int main(int, char**) {
test_copy_assignment_empty_empty();
test_copy_assignment_non_empty_empty();
test_copy_assignment_empty_non_empty();
@@ -599,4 +599,6 @@
test_copy_assignment_sfinae();
test_copy_assignment_not_noexcept();
test_constexpr_copy_assignment();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
index 833883d..c213af4 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
@@ -506,7 +506,7 @@
#endif // > C++17
}
-int main() {
+int main(int, char**) {
test_move_assignment_empty_empty();
test_move_assignment_non_empty_empty();
test_move_assignment_empty_non_empty();
@@ -515,4 +515,6 @@
test_move_assignment_sfinae();
test_move_assignment_noexcept();
test_constexpr_move_assignment();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
index 7357b9b..4ebfe05 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
@@ -126,8 +126,10 @@
#endif
}
-int main() {
+int main(int, char**) {
test_T_ctor_basic();
test_T_ctor_noexcept();
test_T_ctor_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
index b647105..00c94ee 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
@@ -260,7 +260,7 @@
#endif // > C++17
}
-int main() {
+int main(int, char**) {
test_copy_ctor_basic();
test_copy_ctor_valueless_by_exception();
test_copy_ctor_sfinae();
@@ -274,4 +274,6 @@
(void) v2;
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
index ec6eb28..1766ee1 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
@@ -122,9 +122,11 @@
}
}
-int main() {
+int main(int, char**) {
test_default_ctor_basic();
test_default_ctor_sfinae();
test_default_ctor_noexcept();
test_default_ctor_throws();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
index a268adc..cb7d68a 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
@@ -104,7 +104,9 @@
}
}
-int main() {
+int main(int, char**) {
test_ctor_basic();
test_ctor_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
index 9c7e3fa..4b78bf5 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
@@ -110,7 +110,9 @@
}
}
-int main() {
+int main(int, char**) {
test_ctor_basic();
test_ctor_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
index 05b2a29..ab8fe06 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
@@ -114,7 +114,9 @@
}
}
-int main() {
+int main(int, char**) {
test_ctor_basic();
test_ctor_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
index c3f3e58..4061cfb 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
@@ -111,7 +111,9 @@
}
}
-int main() {
+int main(int, char**) {
test_ctor_basic();
test_ctor_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
index ecb4a72..f146e16 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
@@ -331,10 +331,12 @@
#endif // > C++17
}
-int main() {
+int main(int, char**) {
test_move_ctor_basic();
test_move_ctor_valueless_by_exception();
test_move_noexcept();
test_move_ctor_sfinae();
test_constexpr_move_ctor();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.dtor/dtor.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.dtor/dtor.pass.cpp
index 8ced532..b26ab0c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.dtor/dtor.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.dtor/dtor.pass.cpp
@@ -44,7 +44,7 @@
static_assert(!std::is_trivially_copy_constructible<TDtor>::value, "");
static_assert(std::is_trivially_destructible<TDtor>::value, "");
-int main() {
+int main(int, char**) {
{
using V = std::variant<int, long, TDtor>;
static_assert(std::is_trivially_destructible<V>::value, "");
@@ -71,4 +71,6 @@
assert(NonTDtor::count == 0);
assert(NonTDtor1::count == 1);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
index ea84ac9..b688c8e 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
@@ -159,7 +159,9 @@
#endif
}
-int main() {
+int main(int, char**) {
test_basic();
test_emplace_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
index 13e3c92..9d96a1d 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
@@ -92,7 +92,9 @@
assert(&ref3 == &std::get<1>(v));
}
-int main() {
+int main(int, char**) {
test_basic();
test_emplace_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
index 7c9034f..0719f5e 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
@@ -159,7 +159,9 @@
#endif
}
-int main() {
+int main(int, char**) {
test_basic();
test_emplace_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
index 85cd25d..49839ed 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
@@ -92,7 +92,9 @@
assert(&ref3 == &std::get<InitList>(v));
}
-int main() {
+int main(int, char**) {
test_basic();
test_emplace_sfinae();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
index 0afa101..6d463ad 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp
@@ -25,7 +25,7 @@
#include "variant_test_helpers.hpp"
-int main() {
+int main(int, char**) {
{
using V = std::variant<int, long>;
constexpr V v;
@@ -57,4 +57,6 @@
assert(v.index() == std::variant_npos);
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
index 147f380..2cb730c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp
@@ -25,7 +25,7 @@
#include "variant_test_helpers.hpp"
-int main() {
+int main(int, char**) {
{
using V = std::variant<int, long>;
constexpr V v;
@@ -50,4 +50,6 @@
assert(v.valueless_by_exception());
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
index e05cd13..4e273f5 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
@@ -589,10 +589,12 @@
template class std::variant<int, NotSwappable>;
#endif
-int main() {
+int main(int, char**) {
test_swap_valueless_by_exception();
test_swap_same_alternative();
test_swap_different_alternatives();
test_swap_sfinae();
test_swap_noexcept();
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
index a9caeb8..ce79e9c 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp
@@ -23,10 +23,12 @@
#include "variant_test_helpers.hpp"
#include "test_convertible.hpp"
-int main()
+int main(int, char**)
{
// expected-error@variant:* 3 {{static_assert failed}}
std::variant<int, int[]> v; // expected-note {{requested here}}
std::variant<int, int[42]> v2; // expected-note {{requested here}}
std::variant<int, int[][42]> v3; // expected-note {{requested here}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
index 85a10ef..3b93cb0 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp
@@ -18,8 +18,10 @@
#include "test_macros.h"
#include "variant_test_helpers.hpp"
-int main()
+int main(int, char**)
{
// expected-error@variant:* 1 {{static_assert failed}}
std::variant<> v; // expected-note {{requested here}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
index e659f47..7c2c466 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp
@@ -18,10 +18,12 @@
#include "test_macros.h"
#include "variant_test_helpers.hpp"
-int main()
+int main(int, char**)
{
// expected-error@variant:* 3 {{static_assert failed}}
std::variant<int, int&> v; // expected-note {{requested here}}
std::variant<int, const int &> v2; // expected-note {{requested here}}
std::variant<int, int&&> v3; // expected-note {{requested here}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
index ce0675d..27e9c39 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp
@@ -23,10 +23,12 @@
#include "variant_test_helpers.hpp"
#include "test_convertible.hpp"
-int main()
+int main(int, char**)
{
// expected-error@variant:* 3 {{static_assert failed}}
std::variant<int, void> v; // expected-note {{requested here}}
std::variant<int, const void> v2; // expected-note {{requested here}}
std::variant<const volatile void, int> v3; // expected-note {{requested here}}
+
+ return 0;
}
diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
index 198f310..15a1de9 100644
--- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
@@ -310,10 +310,12 @@
std::visit(Visitor{}, v);
}
-int main() {
+int main(int, char**) {
test_call_operator_forwarding();
test_argument_forwarding();
test_constexpr();
test_exceptions();
test_caller_accepts_nonconst();
+
+ return 0;
}