[PATCH] D111698: [clangd] IncludeCleaner: Handle macros coming from ScratchBuffer
Kirill Bobyrev via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Oct 13 02:34:36 PDT 2021
kbobyrev updated this revision to Diff 379318.
kbobyrev added a comment.
Rename the test to have more meaning.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D111698/new/
https://reviews.llvm.org/D111698
Files:
clang-tools-extra/clangd/IncludeCleaner.cpp
clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
Index: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
+++ clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
@@ -167,6 +167,29 @@
UnorderedElementsAre("\"unused.h\"", "\"dir/unused.h\""));
}
+TEST(IncludeCleaner, ScratchBuffer) {
+ TestTU TU;
+ TU.Filename = "foo.cpp";
+ TU.Code = R"cpp(
+ #include "macro_spelling_in_scratch_buffer.h"
+
+ using flags::FLAGS_FOO;
+ )cpp";
+ // The pasting operator in combination with DEFINE_FLAG will create
+ // ScratchBuffer with `flags::FLAGS_FOO` that will have FileID but not
+ // FileEntry.
+ TU.AdditionalFiles["macro_spelling_in_scratch_buffer.h"] = R"cpp(
+ #define DEFINE_FLAG(X) \
+ namespace flags { \
+ int FLAGS_##X; \
+ } \
+
+ DEFINE_FLAG(FOO)
+ )cpp";
+ ParsedAST AST = TU.build();
+ EXPECT_THAT(computeUnusedIncludes(AST), testing::IsEmpty());
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/IncludeCleaner.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.cpp
+++ clang-tools-extra/clangd/IncludeCleaner.cpp
@@ -121,7 +121,8 @@
if (!Macros.insert(FID).second)
return;
const auto &Exp = SM.getSLocEntry(FID).getExpansion();
- add(Exp.getSpellingLoc());
+ if (!SM.isWrittenInScratchSpace(Exp.getSpellingLoc()))
+ add(Exp.getSpellingLoc());
add(Exp.getExpansionLocStart());
add(Exp.getExpansionLocEnd());
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D111698.379318.patch
Type: text/x-patch
Size: 1621 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20211013/b945f413/attachment-0001.bin>
More information about the cfe-commits
mailing list