kbobyrev updated this revision to Diff 379663.
kbobyrev added a comment.
Fix comment.
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,47 @@
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;
+
+ int concat(a, b) = 42;
+ )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)
+
+ #define ab x
+ #define concat(x, y) x##y
+ )cpp";
+ ParsedAST AST = TU.build();
+ auto &SM = AST.getSourceManager();
+ auto &Includes = AST.getIncludeStructure();
+ auto ReferencedFiles = findReferencedFiles(findReferencedLocations(AST), SM);
+ auto Entry = SM.getFileManager().getFile(
+ testPath("macro_spelling_in_scratch_buffer.h"));
+ ASSERT_TRUE(Entry);
+ auto FID = SM.translateFile(*Entry);
+ // No "<scratch space>" FID.
+ EXPECT_THAT(ReferencedFiles, UnorderedElementsAre(FID));
+ // Should not crash due to <scratch space> "files" missing from include
+ // structure.
+ EXPECT_THAT(
+ getUnused(Includes, translateToHeaderIDs(ReferencedFiles, Includes, SM)),
+ ::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,9 +121,15 @@
if (!Macros.insert(FID).second)
return;
const auto &Exp = SM.getSLocEntry(FID).getExpansion();
- add(Exp.getSpellingLoc());
- add(Exp.getExpansionLocStart());
- add(Exp.getExpansionLocEnd());
+ // For token pasting operator in macros, spelling and expansion locations
+ // can be within a temporary buffer that Clang creates (scratch space or
+ // ScratchBuffer). That is not a real file we can include.
+ if (!SM.isWrittenInScratchSpace(Exp.getSpellingLoc()))
+ add(Exp.getSpellingLoc());
+ if (!SM.isWrittenInScratchSpace(Exp.getExpansionLocStart()))
+ add(Exp.getExpansionLocStart());
+ if (!SM.isWrittenInScratchSpace(Exp.getExpansionLocEnd()))
+ add(Exp.getExpansionLocEnd());
}
};
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,47 @@
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;
+
+ int concat(a, b) = 42;
+ )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)
+
+ #define ab x
+ #define concat(x, y) x##y
+ )cpp";
+ ParsedAST AST = TU.build();
+ auto &SM = AST.getSourceManager();
+ auto &Includes = AST.getIncludeStructure();
+ auto ReferencedFiles = findReferencedFiles(findReferencedLocations(AST), SM);
+ auto Entry = SM.getFileManager().getFile(
+ testPath("macro_spelling_in_scratch_buffer.h"));
+ ASSERT_TRUE(Entry);
+ auto FID = SM.translateFile(*Entry);
+ // No "<scratch space>" FID.
+ EXPECT_THAT(ReferencedFiles, UnorderedElementsAre(FID));
+ // Should not crash due to <scratch space> "files" missing from include
+ // structure.
+ EXPECT_THAT(
+ getUnused(Includes, translateToHeaderIDs(ReferencedFiles, Includes, SM)),
+ ::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,9 +121,15 @@
if (!Macros.insert(FID).second)
return;
const auto &Exp = SM.getSLocEntry(FID).getExpansion();
- add(Exp.getSpellingLoc());
- add(Exp.getExpansionLocStart());
- add(Exp.getExpansionLocEnd());
+ // For token pasting operator in macros, spelling and expansion locations
+ // can be within a temporary buffer that Clang creates (scratch space or
+ // ScratchBuffer). That is not a real file we can include.
+ if (!SM.isWrittenInScratchSpace(Exp.getSpellingLoc()))
+ add(Exp.getSpellingLoc());
+ if (!SM.isWrittenInScratchSpace(Exp.getExpansionLocStart()))
+ add(Exp.getExpansionLocStart());
+ if (!SM.isWrittenInScratchSpace(Exp.getExpansionLocEnd()))
+ add(Exp.getExpansionLocEnd());
}
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
