Update tests and make them x86 vs x64 independent (#952)

jarzec · web-flow · commit 15fd458c2384 · 2024-01-20T18:29:42.000-08:00
diff --git a/regression-tests/pure2-repeated-call.cpp2 b/regression-tests/pure2-repeated-call.cpp2
@@ -1,5 +1,10 @@
+f0 : () -> _ = { return 42; }
+f1 : () -> _ = { return f0; }
+f2 : () -> _ = { return f1; }
+f3 : () -> _ = { return f2; }
+f4 : () -> _ = { return f3; }
 
 main: () -> int = {
-    std::cout << std::hash<int>()(0) << std::endl;
+    std::cout << f4()()()()() << std::endl;
     return 0;
 }
diff --git a/regression-tests/pure2-union.cpp2 b/regression-tests/pure2-union.cpp2
@@ -27,7 +27,8 @@ print_name: (non: name_or_number) = {
 
 main: () = {
     x: name_or_number = ();
-    std::cout << "sizeof(x) is (sizeof(x))$\n";
+    std::cout << "sizeof(x) - alignof(x) == max(sizeof(fields))"
+              << " is (sizeof(x) - alignof(name_or_number) == std::max(sizeof(i32), sizeof(std::string)))$\n";
 
     x.print_name();
 
diff --git a/regression-tests/test-results/apple-clang-14/pure2-repeated-call.cpp.execution b/regression-tests/test-results/apple-clang-14/pure2-repeated-call.cpp.execution
@@ -1 +1 @@
-0
+42
diff --git a/regression-tests/test-results/apple-clang-14/pure2-union.cpp.execution b/regression-tests/test-results/apple-clang-14/pure2-union.cpp.execution
@@ -1,4 +1,4 @@
-sizeof(x) is 32
+sizeof(x) - alignof(x) == max(sizeof(fields)) is true
 (not a name)
 xyz
 42
diff --git a/regression-tests/test-results/clang-12/mixed-bugfix-for-ufcs-non-local.cpp.output b/regression-tests/test-results/clang-12/mixed-bugfix-for-ufcs-non-local.cpp.output
@@ -1,118 +1,118 @@
 mixed-bugfix-for-ufcs-non-local.cpp2:13:12: error: a lambda expression cannot appear in this context
 template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_1> bool inline constexpr v0 = false;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
            ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:15:3: error: a lambda expression cannot appear in this context
 t<CPP2_UFCS_NONLOCAL(f)(o)> inline constexpr v1 = t<true>();// Fails on Clang 12 (lambda in unevaluated context).
   ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context
 template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_2> auto g() -> void;
            ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context
 auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void;
                                    ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context
 [[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)>;
                             ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:31:12: error: a lambda expression cannot appear in this context
 template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_3> using a = bool;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
            ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:33:12: error: a lambda expression cannot appear in this context
 template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_4> auto inline constexpr b = false;// Fails on GCC ([GCC109781][]).
            ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:35:13: error: a lambda expression cannot appear in this context
 using c = t<CPP2_UFCS_NONLOCAL(f)(o)>;// Fails on Clang 12 (lambda in unevaluated context) and Clang 12 (a lambda expression cannot appear in this context)
             ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:37:29: error: a lambda expression cannot appear in this context
 auto inline constexpr d = t<CPP2_UFCS_NONLOCAL(f)(o)>();// Fails on Clang 12 (lambda in unevaluated context).
                             ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context
 template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_2> auto g() -> void{}// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)
            ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context
 auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void{}// Fails on Clang 12 (lambda in unevaluated context).
                                    ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context
 [[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)> { return o;  }// Fails on Clang 12 (lambda in unevaluated context).
                             ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 mixed-bugfix-for-ufcs-non-local.cpp2:41:79: error: lambda expression in an unevaluated operand
   inline CPP2_CONSTEXPR bool u::c = [](cpp2::in<std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(f)(o))>> x) mutable -> auto { return x; }(true);// Fails on Clang 12 (lambda in unevaluated context).
                                                                               ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 13 errors generated.
diff --git a/regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-noexcept.cpp.output b/regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-noexcept.cpp.output
@@ -1,10 +1,10 @@
 pure2-bugfix-for-ufcs-noexcept.cpp2:5:26: error: lambda expression in an unevaluated operand
   static_assert(noexcept(CPP2_UFCS(swap)(t(), t())));// Fails on Clang 12 (lambda in unevaluated context) and GCC 10 (static assertion failed)
                          ^
-../../../include/cpp2util.h:933:59: note: expanded from macro 'CPP2_UFCS'
+../../../include/cpp2util.h:928:59: note: expanded from macro 'CPP2_UFCS'
 #define CPP2_UFCS(...)                                    CPP2_UFCS_(&,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 1 error generated.
diff --git a/regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-sfinae.cpp.output b/regression-tests/test-results/clang-12/pure2-bugfix-for-ufcs-sfinae.cpp.output
@@ -1,19 +1,19 @@
 pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
 template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>;
                                                                              ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
 template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>{}// Fails on Clang 12 (lambda in unevaluated context).
                                                                              ^
-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
 #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
                                                           ^
-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'
+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'
 #define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \
                                                     ^
 2 errors generated.
diff --git a/regression-tests/test-results/clang-12/pure2-repeated-call.cpp.execution b/regression-tests/test-results/clang-12/pure2-repeated-call.cpp.execution
@@ -1 +1 @@
-0
+42
diff --git a/regression-tests/test-results/clang-12/pure2-union.cpp.execution b/regression-tests/test-results/clang-12/pure2-union.cpp.execution
@@ -1,4 +1,4 @@
-sizeof(x) is 40
+sizeof(x) - alignof(x) == max(sizeof(fields)) is true
 (not a name)
 xyz
 42
diff --git a/regression-tests/test-results/gcc-10/pure2-repeated-call.cpp.execution b/regression-tests/test-results/gcc-10/pure2-repeated-call.cpp.execution
@@ -1 +1 @@
-0
+42
diff --git a/regression-tests/test-results/gcc-10/pure2-union.cpp.execution b/regression-tests/test-results/gcc-10/pure2-union.cpp.execution
@@ -1,4 +1,4 @@
-sizeof(x) is 40
+sizeof(x) - alignof(x) == max(sizeof(fields)) is true
 (not a name)
 xyz
 42
diff --git a/regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-non-local.cpp.output b/regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-non-local.cpp.output
@@ -1,41 +1,41 @@
 In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
-../../../include/cpp2util.h:918:1: error: lambda-expression in template parameter type
-  918 | [LAMBDADEFCAPT]< \
+../../../include/cpp2util.h:913:1: error: lambda-expression in template parameter type
+  913 | [LAMBDADEFCAPT]< \
       | ^
-../../../include/cpp2util.h:936:59: note: in expansion of macro ‘CPP2_UFCS_’
-  936 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
+../../../include/cpp2util.h:931:59: note: in expansion of macro ‘CPP2_UFCS_’
+  931 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
       |                                                           ^~~~~~~~~~
 mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
-../../../include/cpp2util.h:918:1: error: lambda-expression in template parameter type
-  918 | [LAMBDADEFCAPT]< \
+../../../include/cpp2util.h:913:1: error: lambda-expression in template parameter type
+  913 | [LAMBDADEFCAPT]< \
       | ^
-../../../include/cpp2util.h:936:59: note: in expansion of macro ‘CPP2_UFCS_’
-  936 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
+../../../include/cpp2util.h:931:59: note: in expansion of macro ‘CPP2_UFCS_’
+  931 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
       |                                                           ^~~~~~~~~~
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
-../../../include/cpp2util.h:918:1: error: lambda-expression in template parameter type
-  918 | [LAMBDADEFCAPT]< \
+../../../include/cpp2util.h:913:1: error: lambda-expression in template parameter type
+  913 | [LAMBDADEFCAPT]< \
       | ^
-../../../include/cpp2util.h:936:59: note: in expansion of macro ‘CPP2_UFCS_’
-  936 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
+../../../include/cpp2util.h:931:59: note: in expansion of macro ‘CPP2_UFCS_’
+  931 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
       |                                                           ^~~~~~~~~~
 mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
-../../../include/cpp2util.h:918:1: error: lambda-expression in template parameter type
-  918 | [LAMBDADEFCAPT]< \
+../../../include/cpp2util.h:913:1: error: lambda-expression in template parameter type
+  913 | [LAMBDADEFCAPT]< \
       | ^
-../../../include/cpp2util.h:936:59: note: in expansion of macro ‘CPP2_UFCS_’
-  936 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
+../../../include/cpp2util.h:931:59: note: in expansion of macro ‘CPP2_UFCS_’
+  931 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
       |                                                           ^~~~~~~~~~
 mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
-../../../include/cpp2util.h:918:1: error: lambda-expression in template parameter type
-  918 | [LAMBDADEFCAPT]< \
+../../../include/cpp2util.h:913:1: error: lambda-expression in template parameter type
+  913 | [LAMBDADEFCAPT]< \
       | ^
-../../../include/cpp2util.h:936:59: note: in expansion of macro ‘CPP2_UFCS_’
-  936 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
+../../../include/cpp2util.h:931:59: note: in expansion of macro ‘CPP2_UFCS_’
+  931 | #define CPP2_UFCS_NONLOCAL(...)                           CPP2_UFCS_(,(),,__VA_ARGS__)
       |                                                           ^~~~~~~~~~
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
diff --git a/regression-tests/test-results/gcc-13/pure2-repeated-call.cpp.execution b/regression-tests/test-results/gcc-13/pure2-repeated-call.cpp.execution
@@ -1 +1 @@
-0
+42
diff --git a/regression-tests/test-results/gcc-13/pure2-union.cpp.execution b/regression-tests/test-results/gcc-13/pure2-union.cpp.execution
@@ -1,4 +1,4 @@
-sizeof(x) is 40
+sizeof(x) - alignof(x) == max(sizeof(fields)) is true
 (not a name)
 xyz
 42
diff --git a/regression-tests/test-results/msvc-2022/pure2-repeated-call.cpp.execution b/regression-tests/test-results/msvc-2022/pure2-repeated-call.cpp.execution
@@ -1 +1 @@
-1268118805
+42
diff --git a/regression-tests/test-results/msvc-2022/pure2-union.cpp.execution b/regression-tests/test-results/msvc-2022/pure2-union.cpp.execution
@@ -1,4 +1,4 @@
-sizeof(x) is 28
+sizeof(x) - alignof(x) == max(sizeof(fields)) is true
 (not a name)
 xyz
 42
diff --git a/regression-tests/test-results/pure2-repeated-call.cpp b/regression-tests/test-results/pure2-repeated-call.cpp
diff --git a/regression-tests/test-results/pure2-union.cpp b/regression-tests/test-results/pure2-union.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sizeof(x) is 32`
	`1`	`+sizeof(x) - alignof(x) == max(sizeof(fields)) is true`
`2`	`2`	`(not a name)`
`3`	`3`	`xyz`
`4`	`4`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,118 +1,118 @@`
`1`	`1`	`mixed-bugfix-for-ufcs-non-local.cpp2:13:12: error: a lambda expression cannot appear in this context`
`2`	`2`	`template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_1> bool inline constexpr v0 = false;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)`
`3`	`3`	`^`
`4`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`4`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`5`	`5`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`6`	`6`	`^`
`7`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`7`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`8`	`8`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`9`	`9`	`^`
`10`	`10`	`mixed-bugfix-for-ufcs-non-local.cpp2:15:3: error: a lambda expression cannot appear in this context`
`11`	`11`	`t<CPP2_UFCS_NONLOCAL(f)(o)> inline constexpr v1 = t<true>();// Fails on Clang 12 (lambda in unevaluated context).`
`12`	`12`	`^`
`13`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`13`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`14`	`14`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`15`	`15`	`^`
`16`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`16`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`17`	`17`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`18`	`18`	`^`
`19`	`19`	`mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context`
`20`	`20`	`template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_2> auto g() -> void;`
`21`	`21`	`^`
`22`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`22`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`23`	`23`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`24`	`24`	`^`
`25`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`25`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`26`	`26`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`27`	`27`	`^`
`28`	`28`	`mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context`
`29`	`29`	`auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void;`
`30`	`30`	`^`
`31`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`31`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`32`	`32`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`33`	`33`	`^`
`34`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`34`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`35`	`35`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`36`	`36`	`^`
`37`	`37`	`mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context`
`38`	`38`	`[[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)>;`
`39`	`39`	`^`
`40`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`40`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`41`	`41`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`42`	`42`	`^`
`43`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`43`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`44`	`44`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`45`	`45`	`^`
`46`	`46`	`mixed-bugfix-for-ufcs-non-local.cpp2:31:12: error: a lambda expression cannot appear in this context`
`47`	`47`	`template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_3> using a = bool;// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)`
`48`	`48`	`^`
`49`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`49`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`50`	`50`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`51`	`51`	`^`
`52`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`52`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`53`	`53`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`54`	`54`	`^`
`55`	`55`	`mixed-bugfix-for-ufcs-non-local.cpp2:33:12: error: a lambda expression cannot appear in this context`
`56`	`56`	`template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_4> auto inline constexpr b = false;// Fails on GCC ([GCC109781][]).`
`57`	`57`	`^`
`58`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`58`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`59`	`59`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`60`	`60`	`^`
`61`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`61`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`62`	`62`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`63`	`63`	`^`
`64`	`64`	`mixed-bugfix-for-ufcs-non-local.cpp2:35:13: error: a lambda expression cannot appear in this context`
`65`	`65`	`using c = t<CPP2_UFCS_NONLOCAL(f)(o)>;// Fails on Clang 12 (lambda in unevaluated context) and Clang 12 (a lambda expression cannot appear in this context)`
`66`	`66`	`^`
`67`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`67`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`68`	`68`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`69`	`69`	`^`
`70`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`70`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`71`	`71`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`72`	`72`	`^`
`73`	`73`	`mixed-bugfix-for-ufcs-non-local.cpp2:37:29: error: a lambda expression cannot appear in this context`
`74`	`74`	`auto inline constexpr d = t<CPP2_UFCS_NONLOCAL(f)(o)>();// Fails on Clang 12 (lambda in unevaluated context).`
`75`	`75`	`^`
`76`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`76`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`77`	`77`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`78`	`78`	`^`
`79`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`79`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`80`	`80`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`81`	`81`	`^`
`82`	`82`	`mixed-bugfix-for-ufcs-non-local.cpp2:21:12: error: a lambda expression cannot appear in this context`
`83`	`83`	`template<t<CPP2_UFCS_NONLOCAL(f)(o)> UnnamedTypeParam1_2> auto g() -> void{}// Fails on GCC ([GCC109781][]) and Clang 12 (a lambda expression cannot appear in this context)`
`84`	`84`	`^`
`85`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`85`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`86`	`86`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`87`	`87`	`^`
`88`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`88`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`89`	`89`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`90`	`90`	`^`
`91`	`91`	`mixed-bugfix-for-ufcs-non-local.cpp2:23:36: error: a lambda expression cannot appear in this context`
`92`	`92`	`auto g([[maybe_unused]] cpp2::in<t<CPP2_UFCS_NONLOCAL(f)(o)>> unnamed_param_1) -> void{}// Fails on Clang 12 (lambda in unevaluated context).`
`93`	`93`	`^`
`94`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`94`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`95`	`95`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`96`	`96`	`^`
`97`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`97`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`98`	`98`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`99`	`99`	`^`
`100`	`100`	`mixed-bugfix-for-ufcs-non-local.cpp2:27:29: error: a lambda expression cannot appear in this context`
`101`	`101`	`[[nodiscard]] auto h() -> t<CPP2_UFCS_NONLOCAL(f)(o)> { return o; }// Fails on Clang 12 (lambda in unevaluated context).`
`102`	`102`	`^`
`103`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`103`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`104`	`104`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`105`	`105`	`^`
`106`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`106`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`107`	`107`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`108`	`108`	`^`
`109`	`109`	`mixed-bugfix-for-ufcs-non-local.cpp2:41:79: error: lambda expression in an unevaluated operand`
`110`	`110`	`inline CPP2_CONSTEXPR bool u::c = [](cpp2::in<std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(f)(o))>> x) mutable -> auto { return x; }(true);// Fails on Clang 12 (lambda in unevaluated context).`
`111`	`111`	`^`
`112`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`112`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`113`	`113`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`114`	`114`	`^`
`115`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`115`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`116`	`116`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`117`	`117`	`^`
`118`	`118`	`13 errors generated.`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`pure2-bugfix-for-ufcs-noexcept.cpp2:5:26: error: lambda expression in an unevaluated operand`
`2`	`2`	`static_assert(noexcept(CPP2_UFCS(swap)(t(), t())));// Fails on Clang 12 (lambda in unevaluated context) and GCC 10 (static assertion failed)`
`3`	`3`	`^`
`4`		`-../../../include/cpp2util.h:933:59: note: expanded from macro 'CPP2_UFCS'`
	`4`	`+../../../include/cpp2util.h:928:59: note: expanded from macro 'CPP2_UFCS'`
`5`	`5`	`#define CPP2_UFCS(...) CPP2_UFCS_(&,(),,__VA_ARGS__)`
`6`	`6`	`^`
`7`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`7`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`8`	`8`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`9`	`9`	`^`
`10`	`10`	`1 error generated.`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand`
`2`	`2`	`template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>;`
`3`	`3`	`^`
`4`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`4`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`5`	`5`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`6`	`6`	`^`
`7`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`7`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`8`	`8`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`9`	`9`	`^`
`10`	`10`	`pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand`
`11`	`11`	`template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>{}// Fails on Clang 12 (lambda in unevaluated context).`
`12`	`12`	`^`
`13`		`-../../../include/cpp2util.h:936:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
	`13`	`+../../../include/cpp2util.h:931:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'`
`14`	`14`	`#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,(),,__VA_ARGS__)`
`15`	`15`	`^`
`16`		`-../../../include/cpp2util.h:917:53: note: expanded from macro 'CPP2_UFCS_'`
	`16`	`+../../../include/cpp2util.h:912:53: note: expanded from macro 'CPP2_UFCS_'`
`17`	`17`	`#define CPP2_UFCS_(LAMBDADEFCAPT,QUALID,TEMPKW,...) \`
`18`	`18`	`^`
`19`	`19`	`2 errors generated.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sizeof(x) is 40`
	`1`	`+sizeof(x) - alignof(x) == max(sizeof(fields)) is true`
`2`	`2`	`(not a name)`
`3`	`3`	`xyz`
`4`	`4`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sizeof(x) is 28`
	`1`	`+sizeof(x) - alignof(x) == max(sizeof(fields)) is true`
`2`	`2`	`(not a name)`
`3`	`3`	`xyz`
`4`	`4`	`42`