sammccall created this revision.
sammccall added a reviewer: kadircet.
Herald added subscribers: usaxena95, arphaman.
Herald added a project: All.
sammccall requested review of this revision.
Herald added projects: clang, clang-tools-extra.
Herald added a subscriber: cfe-commits.
Certain idioms are ignored by -Wunused in header files only.
The current "is a header" check assumes that if headers are the main file, we're
building a PCH or a module or something. However in tools we may be parsing the
header in its own right, but still want to treat it as a header.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D129642
Files:
clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
clang/lib/Sema/SemaDecl.cpp
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -1773,7 +1773,7 @@
// FIXME: This needs to be refactored; some other isInMainFile users want
// these semantics.
static bool isMainFileLoc(const Sema &S, SourceLocation Loc) {
- if (S.TUKind != TU_Complete)
+ if (S.TUKind != TU_Complete || S.getLangOpts().IsHeaderFile)
return false;
return S.SourceMgr.isInMainFile(Loc);
}
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -54,6 +54,9 @@
return Field(&Diag::Fixes, UnorderedElementsAre(FixMatcher1, FixMatcher2));
}
+::testing::Matcher<const Diag &> withID(unsigned ID) {
+ return Field(&Diag::ID, ID);
+}
::testing::Matcher<const Diag &>
withNote(::testing::Matcher<Note> NoteMatcher) {
return Field(&Diag::Notes, ElementsAre(NoteMatcher));
@@ -1869,6 +1872,20 @@
"'int' to 'int *' for 1st argument; take the address of "
"the argument with &")))));
}
+
+TEST(DiagnosticsTest, UnusedInHeader) {
+ // Clang diagnoses unused static inline functions outside headers.
+ auto TU = TestTU::withCode("static inline void foo(void) {}");
+ TU.ExtraArgs.push_back("-Wunused-function");
+ TU.Filename = "test.c";
+ EXPECT_THAT(*TU.build().getDiagnostics(),
+ ElementsAre(withID(diag::warn_unused_function)));
+ // Sema should recognize a *.h file open in clangd as a header.
+ // https://github.com/clangd/vscode-clangd/issues/360
+ TU.Filename = "test.h";
+ EXPECT_THAT(*TU.build().getDiagnostics(), IsEmpty());
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -1773,7 +1773,7 @@
// FIXME: This needs to be refactored; some other isInMainFile users want
// these semantics.
static bool isMainFileLoc(const Sema &S, SourceLocation Loc) {
- if (S.TUKind != TU_Complete)
+ if (S.TUKind != TU_Complete || S.getLangOpts().IsHeaderFile)
return false;
return S.SourceMgr.isInMainFile(Loc);
}
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -54,6 +54,9 @@
return Field(&Diag::Fixes, UnorderedElementsAre(FixMatcher1, FixMatcher2));
}
+::testing::Matcher<const Diag &> withID(unsigned ID) {
+ return Field(&Diag::ID, ID);
+}
::testing::Matcher<const Diag &>
withNote(::testing::Matcher<Note> NoteMatcher) {
return Field(&Diag::Notes, ElementsAre(NoteMatcher));
@@ -1869,6 +1872,20 @@
"'int' to 'int *' for 1st argument; take the address of "
"the argument with &")))));
}
+
+TEST(DiagnosticsTest, UnusedInHeader) {
+ // Clang diagnoses unused static inline functions outside headers.
+ auto TU = TestTU::withCode("static inline void foo(void) {}");
+ TU.ExtraArgs.push_back("-Wunused-function");
+ TU.Filename = "test.c";
+ EXPECT_THAT(*TU.build().getDiagnostics(),
+ ElementsAre(withID(diag::warn_unused_function)));
+ // Sema should recognize a *.h file open in clangd as a header.
+ // https://github.com/clangd/vscode-clangd/issues/360
+ TU.Filename = "test.h";
+ EXPECT_THAT(*TU.build().getDiagnostics(), IsEmpty());
+}
+
} // namespace
} // namespace clangd
} // namespace clang
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
