diff options
| -rw-r--r-- | clang/lib/Format/NamespaceEndCommentsFixer.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/Format/NamespaceEndCommentsFixer.cpp b/clang/lib/Format/NamespaceEndCommentsFixer.cpp index af751100ece..88cf123c189 100644 --- a/clang/lib/Format/NamespaceEndCommentsFixer.cpp +++ b/clang/lib/Format/NamespaceEndCommentsFixer.cpp @@ -133,7 +133,7 @@ tooling::Replacements NamespaceEndCommentsFixer::analyze( // Detect "(inline)? namespace" in the beginning of a line. if (NamespaceTok->is(tok::kw_inline)) NamespaceTok = NamespaceTok->getNextNonComment(); - if (NamespaceTok->isNot(tok::kw_namespace)) + if (!NamespaceTok || NamespaceTok->isNot(tok::kw_namespace)) continue; FormatToken *RBraceTok = EndLine->First; if (RBraceTok->Finalized) diff --git a/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp b/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp index 48ecdb038e9..912638f4565 100644 --- a/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp +++ b/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp @@ -582,6 +582,21 @@ TEST_F(NamespaceEndCommentsFixerTest, "} // namespace\n" "}")); } + +TEST_F(NamespaceEndCommentsFixerTest, HandlesInlineAtEndOfLine_PR32438) { + EXPECT_EQ("template <int> struct a {};\n" + "struct a<bool{}> b() {\n" + "}\n" + "#define c inline\n" + "void d() {\n" + "}\n", + fixNamespaceEndComments("template <int> struct a {};\n" + "struct a<bool{}> b() {\n" + "}\n" + "#define c inline\n" + "void d() {\n" + "}\n")); +} } // end namespace } // end namespace format } // end namespace clang |
