From cb2e749e4611d22e710f5c5084420909312405b3 Mon Sep 17 00:00:00 2001 From: Malcolm Parsons Date: Wed, 2 Nov 2016 21:14:22 +0000 Subject: [PATCH] [clang-tidy] Suppress notes for warnings that were ignored Fixes PR30565. Patch by Nikita Kakuev llvm-svn: 285861 --- .../clang-tidy/ClangTidyDiagnosticConsumer.cpp | 9 ++++++++- clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h | 1 + .../test/clang-tidy/Inputs/nolint/trigger_warning.h | 5 +++++ clang-tools-extra/test/clang-tidy/nolint.cpp | 13 +++++++++++-- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index 3b90c55..a58d32d 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -250,7 +250,7 @@ StringRef ClangTidyContext::getCheckName(unsigned DiagnosticID) const { ClangTidyDiagnosticConsumer::ClangTidyDiagnosticConsumer(ClangTidyContext &Ctx) : Context(Ctx), LastErrorRelatesToUserCode(false), - LastErrorPassesLineFilter(false) { + LastErrorPassesLineFilter(false), LastErrorWasIgnored(false) { IntrusiveRefCntPtr DiagOpts = new DiagnosticOptions(); Diags.reset(new DiagnosticsEngine( IntrusiveRefCntPtr(new DiagnosticIDs), &*DiagOpts, this, @@ -309,13 +309,20 @@ static bool LineIsMarkedWithNOLINTinMacro(SourceManager &SM, void ClangTidyDiagnosticConsumer::HandleDiagnostic( DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) { + if (LastErrorWasIgnored && DiagLevel == DiagnosticsEngine::Note) + return; + if (Info.getLocation().isValid() && DiagLevel != DiagnosticsEngine::Error && DiagLevel != DiagnosticsEngine::Fatal && LineIsMarkedWithNOLINTinMacro(Diags->getSourceManager(), Info.getLocation())) { ++Context.Stats.ErrorsIgnoredNOLINT; + // Ignored a warning, should ignore related notes as well + LastErrorWasIgnored = true; return; } + + LastErrorWasIgnored = false; // Count warnings/errors. DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info); diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h index 9f83aac..374331c 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -286,6 +286,7 @@ private: std::unique_ptr HeaderFilter; bool LastErrorRelatesToUserCode; bool LastErrorPassesLineFilter; + bool LastErrorWasIgnored; }; } // end namespace tidy diff --git a/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h b/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h new file mode 100644 index 0000000..e8ebed2 --- /dev/null +++ b/clang-tools-extra/test/clang-tidy/Inputs/nolint/trigger_warning.h @@ -0,0 +1,5 @@ +void A1(const int &In, int &Out) { + if (In > 123) // NOLINT + Out = 123; +} + diff --git a/clang-tools-extra/test/clang-tidy/nolint.cpp b/clang-tools-extra/test/clang-tidy/nolint.cpp index 7def5f3..b07e976 100644 --- a/clang-tools-extra/test/clang-tidy/nolint.cpp +++ b/clang-tools-extra/test/clang-tidy/nolint.cpp @@ -1,4 +1,5 @@ -// RUN: %check_clang_tidy %s google-explicit-constructor,clang-diagnostic-unused-variable %t -- -extra-arg=-Wunused-variable -- +// RUN: %check_clang_tidy %s google-explicit-constructor,clang-diagnostic-unused-variable,clang-analyzer-core.UndefinedBinaryOperatorResult %t -- -extra-arg=-Wunused-variable -- -I%S/Inputs/nolint + class A { A(int i); }; // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: single-argument constructors must be marked explicit @@ -27,4 +28,12 @@ MACRO_NOLINT #define DOUBLE_MACRO MACRO(H) // NOLINT DOUBLE_MACRO -// CHECK-MESSAGES: Suppressed 7 warnings (7 NOLINT) +#include "trigger_warning.h" +void I(int& Out) { + int In; + A1(In, Out); +} +// CHECK-NOT: trigger_warning.h:{{.*}} warning: The left operand of '>' is a garbage value +// CHECK-NOT: :[[@LINE-4]]:{{.*}} note + +// CHECK-MESSAGES: Suppressed 8 warnings (8 NOLINT) -- 2.7.4