Skip to content

Update source_location tests for upcoming EDG changes, one more time #5634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2025
Merged

Update source_location tests for upcoming EDG changes, one more time #5634

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
566c8a3
Update `source_location` tests for upcoming EDG changes, one more time
StephanTLavavej Jul 1, 2025
fed9ce9
clang-format.
StephanTLavavej Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions tests/std/tests/P1208R6_source_location/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,8 @@ constexpr void sub_member_test() {
assert(s_i.x.loc.column() == 5);
#endif // ^^^ C1XX ^^^
#if _USE_DETAILED_FUNCTION_NAME_IN_SOURCE_LOCATION
#ifdef __EDG__ // TRANSITION, EDG is changing to match C1XX's output
assert(s_i.x.loc.function_name() == THISCALL_OR_CDECL " s2::s2(int)"sv
|| s_i.x.loc.function_name() == "s2::s2(int)"sv);
#ifdef __EDG__ // TRANSITION, EDG is changing to almost match C1XX's output
assert(s_i.x.loc.function_name() == "__cdecl s2::s2(int)"sv || s_i.x.loc.function_name() == "s2::s2(int)"sv);
#else // ^^^ workaround / no workaround vvv
assert(s_i.x.loc.function_name() == THISCALL_OR_CDECL " s2::s2(int)"sv);
#endif // ^^^ no workaround ^^^
Expand Down Expand Up @@ -245,7 +244,7 @@ constexpr void lambda_test() {
assert(fun2 == "auto " THISCALL_OR_CDECL " lambda_test()::(anonymous class)::operator()(void) const"sv);
#elif defined(__EDG__) // ^^^ detailed Clang / detailed __EDG__ vvv
// TRANSITION, EDG is changing to resemble C1XX's output somewhat more closely
assert(fun2 == THISCALL_OR_CDECL " lambda [](void)->auto::operator()(void)->auto"sv
assert(fun2 == "__cdecl lambda [](void)->auto::operator()(void)->auto"sv
|| fun2 == "lambda []()->auto::operator()()->auto"sv);
#else // ^^^ detailed __EDG__ / detailed C1XX vvv
assert(fun2.starts_with("struct std::source_location " THISCALL_OR_CDECL " lambda_test::<lambda_"sv));
Expand Down