Skip to content

[lldb] Fix abi_tag parsing for operator<< and operator-named tags #170224

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 3 commits into from
Dec 3, 2025
+12 −5
Merged

[lldb] Fix abi_tag parsing for operator<< and operator-named tags #170224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce5d1a4
[lldb] Support abi_tags in operator<< and literal "operator" tags
da-viper Dec 1, 2025
f0e5b92
[lldb] add the `operator>>` test case
da-viper Dec 2, 2025
3591835
[lldb] add review changes
da-viper Dec 2, 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
11 changes: 6 additions & 5 deletions lldb/source/Plugins/Language/CPlusPlus/CPlusPlusNameParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ bool CPlusPlusNameParser::ConsumeAbiTag() {

// Consume the actual tag string (and allow some special characters)
while (ConsumeToken(tok::raw_identifier, tok::comma, tok::period,
tok::numeric_constant))
tok::numeric_constant, tok::kw_operator))
;

if (!ConsumeToken(tok::r_square))
Expand Down Expand Up @@ -420,10 +420,11 @@ bool CPlusPlusNameParser::ConsumeOperator() {
// Make sure we have more tokens before attempting to look ahead one more.
if (m_next_token_index + 1 < m_tokens.size()) {
// Look ahead two tokens.
clang::Token n_token = m_tokens[m_next_token_index + 1];
// If we find ( or < then this is indeed operator<< no need for fix.
if (n_token.getKind() != tok::l_paren && n_token.getKind() != tok::less) {
clang::Token tmp_tok;
const clang::Token n_token = m_tokens[m_next_token_index + 1];
// If we find `(`, `<` or `[` then this is indeed operator<< no need for
// fix.
if (!n_token.isOneOf(tok::l_paren, tok::less, tok::l_square)) {
clang::Token tmp_tok{};
tmp_tok.startToken();
tmp_tok.setLength(1);
tmp_tok.setLocation(token.getLocation().getLocWithOffset(1));
Expand Down
6 changes: 6 additions & 0 deletions lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ TEST(CPlusPlusLanguage, MethodNameParsing) {
"const",
"std::__1::ranges::__begin::__fn::operator()[abi:v160000]<char const, "
"18ul>"},
{"bool Ball[abi:BALL]<int>::operator<<[abi:operator]<int>(int)", "bool",
"Ball[abi:BALL]<int>", "operator<<[abi:operator]<int>", "(int)", "",
"Ball[abi:BALL]<int>::operator<<[abi:operator]<int>"},
{"bool Ball[abi:BALL]<int>::operator>>[abi:operator]<int>(int)", "bool",
"Ball[abi:BALL]<int>", "operator>>[abi:operator]<int>", "(int)", "",
"Ball[abi:BALL]<int>::operator>>[abi:operator]<int>"},
// Internal classes
{"operator<<(Cls, Cls)::Subclass::function()", "",
"operator<<(Cls, Cls)::Subclass", "function", "()", "",
Expand Down
Loading