Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-27 15:41:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[clangd] IncludeCleaner: Handle macros coming from ScratchBuffer

Browse Source 
Reviewed By: sammccall

Differential Revision: https://reviews.llvm.org/D111698
This commit is contained in:
Kirill Bobyrev 2021-10-14 13:36:25 +02:00
parent 012c0cc7c3
commit 0ce3c7111e
No known key found for this signature in database
GPG Key ID: 2307C055C8384FA0
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang-tools-extra/clangd/IncludeCleaner.cpp
View File

@ -121,9 +121,15 @@ struct ReferencedFiles {
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());
}
};

41
clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
View File

@ -167,6 +167,47 @@ TEST(IncludeCleaner, GetUnusedHeaders) {
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