[PATCH] D124170: [clangd] Include Cleaner: suppress unused warnings for IWYU pragma: export
Kirill Bobyrev via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Apr 21 08:00:52 PDT 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG9f05b111ee1f: [clangd] Include Cleaner: suppress unused warnings for IWYU pragma: export (authored by kbobyrev).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D124170/new/
https://reviews.llvm.org/D124170
Files:
clang-tools-extra/clangd/Headers.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
@@ -511,11 +511,13 @@
TestTU TU;
TU.Code = R"cpp(
#include "behind_keep.h" // IWYU pragma: keep
+ #include "exported.h" // IWYU pragma: export
#include "public.h"
void bar() { foo(); }
)cpp";
TU.AdditionalFiles["behind_keep.h"] = guard("");
+ TU.AdditionalFiles["exported.h"] = guard("");
TU.AdditionalFiles["public.h"] = guard("#include \"private.h\"");
TU.AdditionalFiles["private.h"] = guard(R"cpp(
// IWYU pragma: private, include "public.h"
Index: clang-tools-extra/clangd/Headers.cpp
===================================================================
--- clang-tools-extra/clangd/Headers.cpp
+++ clang-tools-extra/clangd/Headers.cpp
@@ -17,11 +17,13 @@
#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Path.h"
+#include <cstring>
namespace clang {
namespace clangd {
const char IWYUPragmaKeep[] = "// IWYU pragma: keep";
+const char IWYUPragmaExport[] = "// IWYU pragma: export";
class IncludeStructure::RecordHeaders : public PPCallbacks,
public CommentHandler {
@@ -136,15 +138,16 @@
// 2. HandleComment("// IWYU pragma: keep")
// 3. InclusionDirective("bar.h")
//
- // HandleComment will store the last location of "IWYU pragma: keep" comment
- // in the main file, so that when InclusionDirective is called, it will know
- // that the next inclusion is behind the IWYU pragma.
+ // HandleComment will store the last location of "IWYU pragma: keep" (or
+ // export) comment in the main file, so that when InclusionDirective is
+ // called, it will know that the next inclusion is behind the IWYU pragma.
bool HandleComment(Preprocessor &PP, SourceRange Range) override {
if (!inMainFile() || Range.getBegin().isMacroID())
return false;
bool Err = false;
llvm::StringRef Text = SM.getCharacterData(Range.getBegin(), &Err);
- if (Err || !Text.consume_front(IWYUPragmaKeep))
+ if (Err && !Text.consume_front(IWYUPragmaKeep) &&
+ !Text.consume_front(IWYUPragmaExport))
return false;
unsigned Offset = SM.getFileOffset(Range.getBegin());
LastPragmaKeepInMainFileLine =
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D124170.424207.patch
Type: text/x-patch
Size: 2446 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220421/670c99f3/attachment.bin>
More information about the cfe-commits
mailing list