mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 23:56:49 +00:00
Code Issues Projects Releases Wiki Activity

[clang-format] Correctly annotate pointer/reference in _Generic (#133673)

Browse Source 
Fix #133663
This commit is contained in:
Owen Pan 2025-03-31 23:16:41 -07:00 committed by GitHub
parent bae3577002
commit d3be29642f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1417,6 +1417,10 @@ private:
}
} else if (Contexts.back().ContextType == Context::C11GenericSelection) {
Tok->setType(TT_GenericSelectionColon);
auto *Prev = Tok->getPreviousNonComment();
assert(Prev);
if (Prev->isPointerOrReference())
Prev->setFinalizedType(TT_PointerOrReference);
} else if (CurrentToken && CurrentToken->is(tok::numeric_constant)) {
Tok->setType(TT_BitFieldColon);
} else if (Contexts.size() == 1 &&

4
clang/unittests/Format/TokenAnnotatorTest.cpp
View File

@ -363,6 +363,10 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) {
ASSERT_EQ(Tokens.size(), 20u) << Tokens;
EXPECT_TOKEN(Tokens[14], tok::star, TT_PointerOrReference);
Tokens = annotate("#define foo(x) _Generic(x, bar *: 1, default: 0)");
ASSERT_EQ(Tokens.size(), 20u) << Tokens;
EXPECT_TOKEN(Tokens[11], tok::star, TT_PointerOrReference);
Tokens = annotate("Thingy kConfig = {\n"
" 1,\n"
" (uint16_t)(kScale * height_pixels),\n"