This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG22079c61a823: [clangd] IncludeCleaner: Do not process
locations in built-in files (authored by kbobyrev).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D112608/new/
https://reviews.llvm.org/D112608
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
@@ -234,7 +234,7 @@
"<system_header.h>"));
}
-TEST(IncludeCleaner, ScratchBuffer) {
+TEST(IncludeCleaner, VirtualBuffers) {
TestTU TU;
TU.Filename = "foo.cpp";
TU.Code = R"cpp(
@@ -242,6 +242,10 @@
using flags::FLAGS_FOO;
+ // CLI will come from a define, __llvm__ is a built-in. In both cases, they
+ // come from non-existent files.
+ int y = CLI + __llvm__;
+
int concat(a, b) = 42;
)cpp";
// The pasting operator in combination with DEFINE_FLAG will create
@@ -258,6 +262,7 @@
#define ab x
#define concat(x, y) x##y
)cpp";
+ TU.ExtraArgs = {"-DCLI=42"};
ParsedAST AST = TU.build();
auto &SM = AST.getSourceManager();
auto &Includes = AST.getIncludeStructure();
Index: clang-tools-extra/clangd/IncludeCleaner.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.cpp
+++ clang-tools-extra/clangd/IncludeCleaner.cpp
@@ -129,7 +129,9 @@
void add(SourceLocation Loc) { add(SM.getFileID(Loc), Loc); }
void add(FileID FID, SourceLocation Loc) {
- if (FID.isInvalid())
+ // Check if Loc is not written in a physical file.
+ if (FID.isInvalid() || SM.isWrittenInBuiltinFile(Loc) ||
+ SM.isWrittenInCommandLineFile(Loc))
return;
assert(SM.isInFileID(Loc, FID));
if (Loc.isFileID()) {
Index: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
+++ clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
@@ -234,7 +234,7 @@
"<system_header.h>"));
}
-TEST(IncludeCleaner, ScratchBuffer) {
+TEST(IncludeCleaner, VirtualBuffers) {
TestTU TU;
TU.Filename = "foo.cpp";
TU.Code = R"cpp(
@@ -242,6 +242,10 @@
using flags::FLAGS_FOO;
+ // CLI will come from a define, __llvm__ is a built-in. In both cases, they
+ // come from non-existent files.
+ int y = CLI + __llvm__;
+
int concat(a, b) = 42;
)cpp";
// The pasting operator in combination with DEFINE_FLAG will create
@@ -258,6 +262,7 @@
#define ab x
#define concat(x, y) x##y
)cpp";
+ TU.ExtraArgs = {"-DCLI=42"};
ParsedAST AST = TU.build();
auto &SM = AST.getSourceManager();
auto &Includes = AST.getIncludeStructure();
Index: clang-tools-extra/clangd/IncludeCleaner.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.cpp
+++ clang-tools-extra/clangd/IncludeCleaner.cpp
@@ -129,7 +129,9 @@
void add(SourceLocation Loc) { add(SM.getFileID(Loc), Loc); }
void add(FileID FID, SourceLocation Loc) {
- if (FID.isInvalid())
+ // Check if Loc is not written in a physical file.
+ if (FID.isInvalid() || SM.isWrittenInBuiltinFile(Loc) ||
+ SM.isWrittenInCommandLineFile(Loc))
return;
assert(SM.isInFileID(Loc, FID));
if (Loc.isFileID()) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
