Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-10-08 20:04:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[demangler] No need to space adjacent template closings

Browse Source 
With the demangler parenthesizing 'a >> b' inside template parameters,
because C++11 parsing of >> there, we don't really need to add spaces
between adjacent template arg closing '>' chars.  In 2022, that just
looks odd.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D123134
This commit is contained in:
Nathan Sidwell 2022-03-28 12:38:24 -07:00
parent 2cfb243bcd
commit bc150a07f1
5 changed files with 3608 additions and 3592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcxxabi/src/demangle/ItaniumDemangle.h
View File

@ -1381,8 +1381,6 @@ public:
ScopedOverride<unsigned> LT(OB.GtIsGt, 0);
OB += "<";
Params.printWithComma(OB);
if (OB.back() == '>')
OB += " ";
OB += ">";
}
};
@ -1545,16 +1543,16 @@ public:
break;
case SpecialSubKind::string:
OB += "std::basic_string<char, std::char_traits<char>, "
"std::allocator<char> >";
"std::allocator<char>>";
break;
case SpecialSubKind::istream:
OB += "std::basic_istream<char, std::char_traits<char> >";
OB += "std::basic_istream<char, std::char_traits<char>>";
break;
case SpecialSubKind::ostream:
OB += "std::basic_ostream<char, std::char_traits<char> >";
OB += "std::basic_ostream<char, std::char_traits<char>>";
break;
case SpecialSubKind::iostream:
OB += "std::basic_iostream<char, std::char_traits<char> >";
OB += "std::basic_iostream<char, std::char_traits<char>>";
break;
}
}
@ -1903,8 +1901,6 @@ public:
ScopedOverride<unsigned> LT(OB.GtIsGt, 0);
OB += "<";
To->printLeft(OB);
if (OB.back() == '>')
OB += " ";
OB += ">";
}
OB.printOpen();

7172
libcxxabi/test/test_demangle.pass.cpp
View File

File diff suppressed because one or more lines are too long

12
llvm/include/llvm/Demangle/ItaniumDemangle.h
View File

@ -1381,8 +1381,6 @@ public:
ScopedOverride<unsigned> LT(OB.GtIsGt, 0);
OB += "<";
Params.printWithComma(OB);
if (OB.back() == '>')
OB += " ";
OB += ">";
}
};
@ -1545,16 +1543,16 @@ public:
break;
case SpecialSubKind::string:
OB += "std::basic_string<char, std::char_traits<char>, "
"std::allocator<char> >";
"std::allocator<char>>";
break;
case SpecialSubKind::istream:
OB += "std::basic_istream<char, std::char_traits<char> >";
OB += "std::basic_istream<char, std::char_traits<char>>";
break;
case SpecialSubKind::ostream:
OB += "std::basic_ostream<char, std::char_traits<char> >";
OB += "std::basic_ostream<char, std::char_traits<char>>";
break;
case SpecialSubKind::iostream:
OB += "std::basic_iostream<char, std::char_traits<char> >";
OB += "std::basic_iostream<char, std::char_traits<char>>";
break;
}
}
@ -1903,8 +1901,6 @@ public:
ScopedOverride<unsigned> LT(OB.GtIsGt, 0);
OB += "<";
To->printLeft(OB);
if (OB.back() == '>')
OB += " ";
OB += ">";
}
OB.printOpen();

2
llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test
View File

@ -35,7 +35,7 @@ ObjC-EXE: 0000000100000f1b movq 0x10e(%rip), %rsi ## Objc selector ref: da
ObjC-EXE: 0000000100000f25 callq 0x100000f4a ## Objc message: +[NSDate date]
ObjC-EXE: 0000000100000f33 callq 0x100000f44 ## symbol stub for: _NSLog
CXX-EXE: 00000001000014cb callq __ZNSt3__116__pad_and_outputIcNS_11char_traitsIcEEEENS_19ostreambuf_iteratorIT_T0_EES6_PKS4_S8_S8_RNS_8ios_baseES4_ ## std::__1::ostreambuf_iterator<char, std::__1::char_traits<char> > std::__1::__pad_and_output<char, std::__1::char_traits<char> >(std::__1::ostreambuf_iterator<char, std::__1::char_traits<char> >, char const*, char const*, char const*, std::__1::ios_base&, char)
CXX-EXE: 00000001000014cb callq __ZNSt3__116__pad_and_outputIcNS_11char_traitsIcEEEENS_19ostreambuf_iteratorIT_T0_EES6_PKS4_S8_S8_RNS_8ios_baseES4_ ## std::__1::ostreambuf_iterator<char, std::__1::char_traits<char>> std::__1::__pad_and_output<char, std::__1::char_traits<char>>(std::__1::ostreambuf_iterator<char, std::__1::char_traits<char>>, char const*, char const*, char const*, std::__1::ios_base&, char)
i386-OBJ: 0000002f calll _printf

2
llvm/unittests/Demangle/PartialDemangleTest.cpp
View File

@ -43,7 +43,7 @@ static ChoppedName NamesToTest[] = {
{"_ZN1S1fB4MERPIiEEvv", "S", "f", "void", "()"},
{"_ZNSsC1EmcRKSaIcE",
"std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
"std::basic_string<char, std::char_traits<char>, std::allocator<char>>",
"basic_string", "", "(unsigned long, char, std::allocator<char> const&)"},
{"_ZNSsixEm", "std::string", "operator[]", "", "(unsigned long)"},
{"_ZSt17__throw_bad_allocv", "std", "__throw_bad_alloc", "", "()"},