diff options
| author | Owen Pan <owenpiano@gmail.com> | 2025-03-31 23:16:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-31 23:16:41 -0700 |
| commit | d3be29642fa65e5ade434d860cfcc193f8278d4e (patch) | |
| tree | 4d97c9f94b0a795f7b61b96ee6597c431a990b7c | |
| parent | bae3577002b6bda92837723a06a4ca5c498d300f (diff) | |
| download | llvm-d3be29642fa65e5ade434d860cfcc193f8278d4e.zip llvm-d3be29642fa65e5ade434d860cfcc193f8278d4e.tar.gz llvm-d3be29642fa65e5ade434d860cfcc193f8278d4e.tar.bz2 | |
[clang-format] Correctly annotate pointer/reference in _Generic (#133673)
Fix #133663
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 | ||||
| -rw-r--r-- | clang/unittests/Format/TokenAnnotatorTest.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index d87b3a6..dfb59e8 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -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 && diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index ac5e979..af9fd57 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -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" |