@@ -96,19 +96,15 @@ constexpr void sloc_constructor_test() {
9696 assert (x.loc .column () == 13 );
9797#endif // ^^^ !defined(__EDG__) ^^^
9898#if _USE_DETAILED_FUNCTION_NAME_IN_SOURCE_LOCATION
99- #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783
100- if (is_constant_evaluated ()) {
101- assert (x.loc .function_name () == " int __cdecl main(void)" sv);
102- } else
99+ #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783 (fixed in MSVC Compiler 19.51)
100+ if (!is_constant_evaluated ())
103101#endif // ^^^ workaround ^^^
104102 {
105103 assert (x.loc .function_name () == " void __cdecl sloc_constructor_test(void)" sv);
106104 }
107105#else // ^^^ detailed / basic vvv
108- #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783
109- if (is_constant_evaluated ()) {
110- assert (x.loc .function_name () == " main" sv);
111- } else
106+ #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783 (fixed in MSVC Compiler 19.51)
107+ if (!is_constant_evaluated ())
112108#endif // ^^^ workaround ^^^
113109 {
114110 assert (x.loc .function_name () == " sloc_constructor_test" sv);
@@ -146,19 +142,15 @@ constexpr void sub_member_test() {
146142 assert (s.x .loc .column () == 14 );
147143#endif // ^^^ !defined(__EDG__) ^^^
148144#if _USE_DETAILED_FUNCTION_NAME_IN_SOURCE_LOCATION
149- #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783
150- if (is_constant_evaluated ()) {
151- assert (s.x .loc .function_name () == " int __cdecl main(void)" sv);
152- } else
145+ #if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783 (fixed in MSVC Compiler 19.51)
146+ if (!is_constant_evaluated ())
153147#endif // ^^^ workaround ^^^
154148 {
155149 assert (s.x .loc .function_name () == " void __cdecl sub_member_test(void)" sv);
156150 }
157151#else // ^^^ detailed / basic vvv
158152#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1285783
159- if (is_constant_evaluated ()) {
160- assert (s.x .loc .function_name () == " main" sv);
161- } else
153+ if (!is_constant_evaluated ())
162154#endif // ^^^ workaround ^^^
163155 {
164156 assert (s.x .loc .function_name () == " sub_member_test" sv);
0 commit comments