Skip to content

Commit 5942bdd

Browse files
MaxSagebaumMaxSagebaum
committed
Update for tests.
1 parent 4cfbe00 commit 5942bdd

27 files changed

+221
-478
lines changed

‎regression-tests/test-results/clang-12-c++20/mixed-bugfix-for-ufcs-non-local.cpp.output

Lines changed: 41 additions & 209 deletions
Large diffs are not rendered by default.

‎regression-tests/test-results/clang-12-c++20/pure2-bugfix-for-non-local-function-expression.cpp.output

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
1-
pure2-bugfix-for-non-local-function-expression.cpp2:5:34: error: lambda expression in an unevaluated operand
2-
template<typename T> concept v = []() mutable -> bool { return true; }();
3-
^
4-
pure2-bugfix-for-non-local-function-expression.cpp2:7:41: error: lambda expression in an unevaluated operand
5-
using u = std::type_identity_t<decltype([]() mutable -> void{})>;
6-
^
7-
pure2-bugfix-for-non-local-function-expression.cpp2:9:47: error: lambda expression in an unevaluated operand
8-
class t: public std::type_identity_t<decltype([]() mutable -> void{})> {
9-
^
10-
3 errors generated.
1+

‎regression-tests/test-results/clang-12-c++20/pure2-bugfix-for-ufcs-noexcept.cpp.output

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,41 @@
1-
pure2-bugfix-for-ufcs-noexcept.cpp2:5:26: error: lambda expression in an unevaluated operand
2-
static_assert(noexcept(CPP2_UFCS(swap)(t(), t())));// Fails on Clang 12 (lambda in unevaluated context) and GCC 10 (static assertion failed)
3-
^
4-
<<<<<<< HEAD
5-
../../../include/cpp2util.h:1171:59: note: expanded from macro 'CPP2_UFCS'
6-
#define CPP2_UFCS(...) CPP2_UFCS_(&,CPP2_UFCS_EMPTY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
7-
^
8-
../../../include/cpp2util.h:1138:66: note: expanded from macro 'CPP2_UFCS_'
9-
=======
10-
../../../include/cpp2util.h:2132:59: note: expanded from macro 'CPP2_UFCS'
11-
#define CPP2_UFCS(...) CPP2_UFCS_(&,CPP2_UFCS_EMPTY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
12-
^
13-
../../../include/cpp2util.h:2099:66: note: expanded from macro 'CPP2_UFCS_'
14-
>>>>>>> origin/main
15-
#define CPP2_UFCS_(LAMBDADEFCAPT,SFINAE,MVFWD,QUALID,TEMPKW,...) \
16-
^
17-
1 error generated.
1+
In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
2+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
3+
2100 | // compiler may not assume it knows anything at all about
4+
| ^
5+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
6+
2137 | //
7+
| ^
8+
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
9+
mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
10+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
11+
2100 | // compiler may not assume it knows anything at all about
12+
| ^
13+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
14+
2137 | //
15+
| ^
16+
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
17+
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
18+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
19+
2100 | // compiler may not assume it knows anything at all about
20+
| ^
21+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
22+
2137 | //
23+
| ^
24+
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
25+
mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
26+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
27+
2100 | // compiler may not assume it knows anything at all about
28+
| ^
29+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
30+
2137 | //
31+
| ^
32+
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
33+
mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
34+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
35+
2100 | // compiler may not assume it knows anything at all about
36+
| ^
37+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
38+
2137 | //
39+
| ^
40+
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
41+
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid

‎regression-tests/test-results/clang-12-c++20/pure2-bugfix-for-ufcs-sfinae.cpp.output

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
1-
pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
2-
template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>;
3-
^
4-
<<<<<<< HEAD
5-
../../../include/cpp2util.h:1176:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
6-
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
7-
^
8-
../../../include/cpp2util.h:1138:66: note: expanded from macro 'CPP2_UFCS_'
9-
=======
10-
../../../include/cpp2util.h:2137:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
11-
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
12-
^
13-
../../../include/cpp2util.h:2099:66: note: expanded from macro 'CPP2_UFCS_'
14-
>>>>>>> origin/main
15-
#define CPP2_UFCS_(LAMBDADEFCAPT,SFINAE,MVFWD,QUALID,TEMPKW,...) \
16-
^
17-
pure2-bugfix-for-ufcs-sfinae.cpp2:1:78: error: lambda expression in an unevaluated operand
18-
template<typename T> [[nodiscard]] auto f() -> std::type_identity_t<decltype(CPP2_UFCS_NONLOCAL(a)(T()))>{}// Fails on Clang 12 (lambda in unevaluated context).
19-
^
20-
<<<<<<< HEAD
21-
../../../include/cpp2util.h:1176:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
22-
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
23-
^
24-
../../../include/cpp2util.h:1138:66: note: expanded from macro 'CPP2_UFCS_'
25-
=======
26-
../../../include/cpp2util.h:2137:59: note: expanded from macro 'CPP2_UFCS_NONLOCAL'
27-
#define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
28-
^
29-
../../../include/cpp2util.h:2099:66: note: expanded from macro 'CPP2_UFCS_'
30-
>>>>>>> origin/main
31-
#define CPP2_UFCS_(LAMBDADEFCAPT,SFINAE,MVFWD,QUALID,TEMPKW,...) \
32-
^
33-
2 errors generated.
1+
In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
2+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
3+
2100 | // compiler may not assume it knows anything at all about
4+
| ^
5+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
6+
2137 | //
7+
| ^
8+
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
9+
mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
10+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
11+
2100 | // compiler may not assume it knows anything at all about
12+
| ^
13+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
14+
2137 | //
15+
| ^
16+
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
17+
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
18+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
19+
2100 | // compiler may not assume it knows anything at all about
20+
| ^
21+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
22+
2137 | //
23+
| ^
24+
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
25+
mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
26+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
27+
2100 | // compiler may not assume it knows anything at all about
28+
| ^
29+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
30+
2137 | //
31+
| ^
32+
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
33+
mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
34+
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
35+
2100 | // compiler may not assume it knows anything at all about
36+
| ^
37+
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
38+
2137 | //
39+
| ^
40+
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
41+
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid

‎regression-tests/test-results/gcc-13-c++2b/mixed-bugfix-for-ufcs-non-local.cpp.output

Lines changed: 10 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,41 @@
11
In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
2-
<<<<<<< HEAD
3-
../../../include/cpp2util.h:1139:1: error: lambda-expression in template parameter type
4-
1139 | [LAMBDADEFCAPT]< \
5-
| ^
6-
../../../include/cpp2util.h:1176:59: note: in expansion of macro ‘CPP2_UFCS_’
7-
1176 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
8-
| ^~~~~~~~~~
9-
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
10-
mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
11-
../../../include/cpp2util.h:1139:1: error: lambda-expression in template parameter type
12-
1139 | [LAMBDADEFCAPT]< \
13-
| ^
14-
../../../include/cpp2util.h:1176:59: note: in expansion of macro ‘CPP2_UFCS_’
15-
1176 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
16-
| ^~~~~~~~~~
17-
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
18-
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
19-
../../../include/cpp2util.h:1139:1: error: lambda-expression in template parameter type
20-
1139 | [LAMBDADEFCAPT]< \
21-
| ^
22-
../../../include/cpp2util.h:1176:59: note: in expansion of macro ‘CPP2_UFCS_’
23-
1176 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
24-
| ^~~~~~~~~~
25-
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
26-
mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
27-
../../../include/cpp2util.h:1139:1: error: lambda-expression in template parameter type
28-
1139 | [LAMBDADEFCAPT]< \
29-
| ^
30-
../../../include/cpp2util.h:1176:59: note: in expansion of macro ‘CPP2_UFCS_’
31-
1176 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
32-
| ^~~~~~~~~~
33-
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
34-
mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
35-
../../../include/cpp2util.h:1139:1: error: lambda-expression in template parameter type
36-
1139 | [LAMBDADEFCAPT]< \
37-
| ^
38-
../../../include/cpp2util.h:1176:59: note: in expansion of macro ‘CPP2_UFCS_’
39-
1176 | #define CPP2_UFCS_NONLOCAL(...) CPP2_UFCS_(,CPP2_UFCS_IDENTITY,CPP2_UFCS_IDENTITY,(),,__VA_ARGS__)
40-
| ^~~~~~~~~~
41-
=======
422
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
43-
2100 | template<typename T>
3+
2100 | // compiler may not assume it knows anything at all about
444
| ^
455
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
46-
2137 | class c_raii {
6+
2137 | //
477
| ^
488
mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
499
mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
5010
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
51-
2100 | template<typename T>
11+
2100 | // compiler may not assume it knows anything at all about
5212
| ^
5313
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
54-
2137 | class c_raii {
14+
2137 | //
5515
| ^
5616
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
5717
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
5818
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
59-
2100 | template<typename T>
19+
2100 | // compiler may not assume it knows anything at all about
6020
| ^
6121
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
62-
2137 | class c_raii {
22+
2137 | //
6323
| ^
6424
mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
6525
mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
6626
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
67-
2100 | template<typename T>
27+
2100 | // compiler may not assume it knows anything at all about
6828
| ^
6929
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
70-
2137 | class c_raii {
30+
2137 | //
7131
| ^
7232
mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
7333
mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
7434
../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
75-
2100 | template<typename T>
35+
2100 | // compiler may not assume it knows anything at all about
7636
| ^
7737
../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
78-
2137 | class c_raii {
38+
2137 | //
7939
| ^
80-
>>>>>>> origin/main
8140
mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
8241
mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid

‎regression-tests/test-results/gcc-13-c++2b/pure2-bugfix-for-non-local-function-expression.cpp.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
pure2-bugfix-for-non-local-function-expression.cpp2:9:7: warning: ‘t’ has a base ‘t::<lambda()>’ which has no linkage [-Wsubobject-linkage]

0 commit comments

Comments
 (0)