Skip to content

Commit 5137587

Browse files
Michael137Michael137
committed
[lldb][test] MangledTest: don't use designated initializers
It's a C++20 feature and is causing some buildbots to fail: ``` FAILED: tools/lldb/unittests/Core/CMakeFiles/LLDBCoreTests.dir/MangledTest.cpp.obj ccache C:\PROGRA~1\MICROS~1\2022\COMMUN~1\VC\Tools\MSVC\1443~1.348\bin\Hostx64\x64\cl.exe /nologo /TP -DGTEST_HAS_RTTI=0 -DLLVM_BUILD_STATIC -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_ENABLE_EXTENDED_ALIGNED_STORAGE -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\buildbot\as-builder-10\lldb-x-aarch64\build\tools\lldb\unittests\Core -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\build\tools\lldb\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\build\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\llvm\include -IC:\Python312\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\llvm\..\clang\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\build\tools\lldb\..\clang\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\source -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\third-party\unittest\googletest\include -IC:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\third-party\unittest\googlemock\include -D__OPTIMIZE__ /Zc:inline /Zc:preprocessor /Zc:__cplusplus /Oi /bigobj /permissive- /W4 -wd4141 -wd4146 -wd4244 -wd4267 -wd4291 -wd4351 -wd4456 -wd4457 -wd4458 -wd4459 -wd4503 -wd4624 -wd4722 -wd4100 -wd4127 -wd4512 -wd4505 -wd4610 -wd4510 -wd4702 -wd4245 -wd4706 -wd4310 -wd4701 -wd4703 -wd4389 -wd4611 -wd4805 -wd4204 -wd4577 -wd4091 -wd4592 -wd4319 -wd4709 -wd5105 -wd4324 -wd4251 -wd4275 -w14062 -we4238 /Gw /O2 /Ob2 -MD -wd4018 -wd4068 -wd4150 -wd4201 -wd4251 -wd4521 -wd4530 -wd4589 /EHs-c- /GR- -UNDEBUG -std:c++17 /showIncludes /Fotools\lldb\unittests\Core\CMakeFiles\LLDBCoreTests.dir\MangledTest.cpp.obj /Fdtools\lldb\unittests\Core\CMakeFiles\LLDBCoreTests.dir\ /FS -c C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(416): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(415): error C7556: cannot mix designated-initializers with non-designated-initializers C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(418): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(423): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(422): error C7556: cannot mix designated-initializers with non-designated-initializers C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(424): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(429): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(428): error C7556: cannot mix designated-initializers with non-designated-initializers C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(431): error C7555: use of designated initializers requires at least '/std:c++20' C:\buildbot\as-builder-10\lldb-x-aarch64\llvm-project\lldb\unittests\Core\MangledTest.cpp(436): error C7555: use of designated initializers requires at least '/std:c++20' ```
1 parent 0f73e89 commit 5137587

File tree

1 file changed

+79
-79
lines changed

1 file changed

+79
-79
lines changed

‎lldb/unittests/Core/MangledTest.cpp‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -413,115 +413,115 @@ struct DemanglingPartsTestCase {
413413
DemanglingPartsTestCase g_demangling_parts_test_cases[] = {
414414
// clang-format off
415415
{ "_ZNVKO3BarIN2ns3QuxIiEEE1CIPFi3FooIS_IiES6_EEE6methodIS6_EENS5_IT_SC_E5InnerIiEESD_SD_",
416-
{ .BasenameRange = {92, 98}, .ScopeRange = {36, 92}, .ArgumentsRange = { 108, 158 },
417-
.QualifiersRange = {158, 176} },
418-
.basename = "method",
419-
.scope = "Bar<ns::Qux<int>>::C<int (*)(Foo<Bar<int>, Bar<int>>)>::",
420-
.qualifiers = " const volatile &&"
416+
{ /*.BasenameRange=*/{92, 98}, /*.ScopeRange=*/{36, 92}, /*.ArgumentsRange=*/{ 108, 158 },
417+
/*.QualifiersRange=*/{158, 176} },
418+
/*.basename=*/"method",
419+
/*.scope=*/"Bar<ns::Qux<int>>::C<int (*)(Foo<Bar<int>, Bar<int>>)>::",
420+
/*.qualifiers=*/" const volatile &&"
421421
},
422422
{ "_Z7getFuncIfEPFiiiET_",
423-
{ .BasenameRange = {6, 13}, .ScopeRange = {6, 6}, .ArgumentsRange = { 20, 27 }, .QualifiersRange = {38, 38} },
424-
.basename = "getFunc",
425-
.scope = "",
426-
.qualifiers = ""
423+
{ /*.BasenameRange=*/{6, 13}, /*.ScopeRange=*/{6, 6}, /*.ArgumentsRange=*/{ 20, 27 }, /*.QualifiersRange=*/{38, 38} },
424+
/*.basename=*/"getFunc",
425+
/*.scope=*/"",
426+
/*.qualifiers=*/""
427427
},
428428
{ "_ZN1f1b1c1gEv",
429-
{ .BasenameRange = {9, 10}, .ScopeRange = {0, 9}, .ArgumentsRange = { 10, 12 },
430-
.QualifiersRange = {12, 12} },
431-
.basename = "g",
432-
.scope = "f::b::c::",
433-
.qualifiers = ""
429+
{ /*.BasenameRange=*/{9, 10}, /*.ScopeRange=*/{0, 9}, /*.ArgumentsRange=*/{ 10, 12 },
430+
/*.QualifiersRange=*/{12, 12} },
431+
/*.basename=*/"g",
432+
/*.scope=*/"f::b::c::",
433+
/*.qualifiers=*/""
434434
},
435435
{ "_ZN5test73fD1IiEEDTcmtlNS_1DEL_ZNS_1bEEEcvT__EES2_",
436-
{ .BasenameRange = {45, 48}, .ScopeRange = {38, 45}, .ArgumentsRange = { 53, 58 },
437-
.QualifiersRange = {58, 58} },
438-
.basename = "fD1",
439-
.scope = "test7::",
440-
.qualifiers = ""
436+
{ /*.BasenameRange=*/{45, 48}, /*.ScopeRange=*/{38, 45}, /*.ArgumentsRange=*/{ 53, 58 },
437+
/*.QualifiersRange=*/{58, 58} },
438+
/*.basename=*/"fD1",
439+
/*.scope=*/"test7::",
440+
/*.qualifiers=*/""
441441
},
442442
{ "_ZN5test73fD1IiEEDTcmtlNS_1DEL_ZNS_1bINDT1cE1dEEEEEcvT__EES2_",
443-
{ .BasenameRange = {61, 64}, .ScopeRange = {54, 61}, .ArgumentsRange = { 69, 79 },
444-
.QualifiersRange = {79, 79} },
445-
.basename = "fD1",
446-
.scope = "test7::",
447-
.qualifiers = ""
443+
{ /*.BasenameRange=*/{61, 64}, /*.ScopeRange=*/{54, 61}, /*.ArgumentsRange=*/{ 69, 79 },
444+
/*.QualifiersRange=*/{79, 79} },
445+
/*.basename=*/"fD1",
446+
/*.scope=*/"test7::",
447+
/*.qualifiers=*/""
448448
},
449449
{ "_ZN5test7INDT1cE1dINDT1cE1dEEEE3fD1INDT1cE1dINDT1cE1dEEEEEDTcmtlNS_1DEL_ZNS_1bINDT1cE1dEEEEEcvT__EES2_",
450-
{ .BasenameRange = {120, 123}, .ScopeRange = {81, 120}, .ArgumentsRange = { 155, 168 },
451-
.QualifiersRange = {168, 168} },
452-
.basename = "fD1",
453-
.scope = "test7<decltype(c)::d<decltype(c)::d>>::",
454-
.qualifiers = ""
450+
{ /*.BasenameRange=*/{120, 123}, /*.ScopeRange=*/{81, 120}, /*.ArgumentsRange=*/{ 155, 168 },
451+
/*.QualifiersRange=*/{168, 168} },
452+
/*.basename=*/"fD1",
453+
/*.scope=*/"test7<decltype(c)::d<decltype(c)::d>>::",
454+
/*.qualifiers=*/""
455455
},
456456
{ "_ZN8nlohmann16json_abi_v3_11_310basic_jsonINSt3__13mapENS2_6vectorENS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEbxydS8_NS0_14adl_serializerENS4_IhNS8_IhEEEEvE5parseIRA29_KcEESE_OT_NS2_8functionIFbiNS0_6detail13parse_event_tERSE_EEEbb",
457-
{ .BasenameRange = {687, 692}, .ScopeRange = {343, 687}, .ArgumentsRange = { 713, 1174 },
458-
.QualifiersRange = {1174, 1174} },
459-
.basename = "parse",
460-
.scope = "nlohmann::json_abi_v3_11_3::basic_json<std::__1::map, std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, bool, long long, unsigned long long, double, std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer, std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
461-
.qualifiers = ""
457+
{ /*.BasenameRange=*/{687, 692}, /*.ScopeRange=*/{343, 687}, /*.ArgumentsRange=*/{ 713, 1174 },
458+
/*.QualifiersRange=*/{1174, 1174} },
459+
/*.basename=*/"parse",
460+
/*.scope=*/"nlohmann::json_abi_v3_11_3::basic_json<std::__1::map, std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, bool, long long, unsigned long long, double, std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer, std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
461+
/*.qualifiers=*/""
462462
},
463463
{ "_ZN8nlohmann16json_abi_v3_11_310basic_jsonINSt3__13mapENS2_6vectorENS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEbxydS8_NS0_14adl_serializerENS4_IhNS8_IhEEEEvEC1EDn",
464-
{ .BasenameRange = {344, 354}, .ScopeRange = {0, 344}, .ArgumentsRange = { 354, 370 },
465-
.QualifiersRange = {370, 370} },
466-
.basename = "basic_json",
467-
.scope = "nlohmann::json_abi_v3_11_3::basic_json<std::__1::map, std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, bool, long long, unsigned long long, double, std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer, std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
468-
.qualifiers = ""
464+
{ /*.BasenameRange=*/{344, 354}, /*.ScopeRange=*/{0, 344}, /*.ArgumentsRange=*/{ 354, 370 },
465+
/*.QualifiersRange=*/{370, 370} },
466+
/*.basename=*/"basic_json",
467+
/*.scope=*/"nlohmann::json_abi_v3_11_3::basic_json<std::__1::map, std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, bool, long long, unsigned long long, double, std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer, std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
468+
/*.qualifiers=*/""
469469
},
470470
{ "_Z3fppIiEPFPFvvEiEf",
471-
{ .BasenameRange = {10, 13}, .ScopeRange = {10, 10}, .ArgumentsRange = { 18, 25 }, .QualifiersRange = {34,34} },
472-
.basename = "fpp",
473-
.scope = "",
474-
.qualifiers = ""
471+
{ /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10}, /*.ArgumentsRange=*/{ 18, 25 }, /*.QualifiersRange=*/{34,34} },
472+
/*.basename=*/"fpp",
473+
/*.scope=*/"",
474+
/*.qualifiers=*/""
475475
},
476476
{ "_Z3fppIiEPFPFvvEN2ns3FooIiEEEf",
477-
{ .BasenameRange = {10, 13}, .ScopeRange = {10, 10}, .ArgumentsRange = { 18, 25 },
478-
.QualifiersRange = {43, 43} },
479-
.basename = "fpp",
480-
.scope = "",
481-
.qualifiers = ""
477+
{ /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10}, /*.ArgumentsRange=*/{ 18, 25 },
478+
/*.QualifiersRange=*/{43, 43} },
479+
/*.basename=*/"fpp",
480+
/*.scope=*/"",
481+
/*.qualifiers=*/""
482482
},
483483
{ "_Z3fppIiEPFPFvPFN2ns3FooIiEENS2_3BarIfE3QuxEEEPFS2_S2_EEf",
484-
{ .BasenameRange = {10, 13}, .ScopeRange = {10, 10}, .ArgumentsRange = { 18, 25 },
485-
.QualifiersRange = {108, 108} },
486-
.basename = "fpp",
487-
.scope = "",
488-
.qualifiers = ""
484+
{ /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10}, /*.ArgumentsRange=*/{ 18, 25 },
485+
/*.QualifiersRange=*/{108, 108} },
486+
/*.basename=*/"fpp",
487+
/*.scope=*/"",
488+
/*.qualifiers=*/""
489489
},
490490
{ "_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvvEiEf",
491-
{ .BasenameRange = {64, 67}, .ScopeRange = {10, 64}, .ArgumentsRange = { 72, 79 },
492-
.QualifiersRange = {88, 88} },
493-
.basename = "fpp",
494-
.scope = "ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
495-
.qualifiers = ""
491+
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64}, /*.ArgumentsRange=*/{ 72, 79 },
492+
/*.QualifiersRange=*/{88, 88} },
493+
/*.basename=*/"fpp",
494+
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
495+
/*.qualifiers=*/""
496496
},
497497
{ "_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvvES2_Ef",
498-
{ .BasenameRange = {64, 67}, .ScopeRange = {10, 64}, .ArgumentsRange = { 72, 79 },
499-
.QualifiersRange = {97, 97} },
500-
.basename = "fpp",
501-
.scope = "ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
502-
.qualifiers = "",
498+
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64}, /*.ArgumentsRange=*/{ 72, 79 },
499+
/*.QualifiersRange=*/{97, 97} },
500+
/*.basename=*/"fpp",
501+
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
502+
/*.qualifiers=*/"",
503503
},
504504
{ "_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvPFS2_S5_EEPFS2_S2_EEf",
505-
{ .BasenameRange = {64, 67}, .ScopeRange = {10, 64}, .ArgumentsRange = { 72, 79 },
506-
.QualifiersRange = {162, 162} },
507-
.basename = "fpp",
508-
.scope = "ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
509-
.qualifiers = "",
505+
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64}, /*.ArgumentsRange=*/{ 72, 79 },
506+
/*.QualifiersRange=*/{162, 162} },
507+
/*.basename=*/"fpp",
508+
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
509+
/*.qualifiers=*/"",
510510
},
511511
{ "_ZNKO2ns3ns23Bar3fooIiEEPFPFNS0_3FooIiEEiENS3_IfEEEi",
512-
{ .BasenameRange = {37, 40}, .ScopeRange = {23, 37}, .ArgumentsRange = { 45, 50 },
513-
.QualifiersRange = {78, 87} },
514-
.basename = "foo",
515-
.scope = "ns::ns2::Bar::",
516-
.qualifiers = " const &&",
512+
{ /*.BasenameRange=*/{37, 40}, /*.ScopeRange=*/{23, 37}, /*.ArgumentsRange=*/{ 45, 50 },
513+
/*.QualifiersRange=*/{78, 87} },
514+
/*.basename=*/"foo",
515+
/*.scope=*/"ns::ns2::Bar::",
516+
/*.qualifiers=*/" const &&",
517517
},
518518
{ "_ZTV11ImageLoader",
519-
{ .BasenameRange = {0, 0}, .ScopeRange = {0, 0}, .ArgumentsRange = { 0, 0 },
520-
.QualifiersRange = {0, 0} },
521-
.basename = "",
522-
.scope = "",
523-
.qualifiers = "",
524-
.valid_basename = false
519+
{ /*.BasenameRange=*/{0, 0}, /*.ScopeRange=*/{0, 0}, /*.ArgumentsRange=*/{ 0, 0 },
520+
/*.QualifiersRange=*/{0, 0} },
521+
/*.basename=*/"",
522+
/*.scope=*/"",
523+
/*.qualifiers=*/"",
524+
/*.valid_basename=*/false
525525
}
526526
// clang-format on
527527
};

0 commit comments

Comments
 (0)