diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 17128f15d345a..c60bf3085b65c 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -464,6 +464,11 @@ Crash and bug fixes Improvements ^^^^^^^^^^^^ +- The checker option ``optin.cplusplus.VirtualCall:PureOnly`` was removed, + because it had been deprecated since 2019 and it is completely useless (it + was kept only for compatibility with pre-2019 versions, setting it to true is + equivalent to completely disabling the checker). + Moved checkers ^^^^^^^^^^^^^^ diff --git a/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td b/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td index 6632254955fe6..35df4e7003ac9 100644 --- a/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td +++ b/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td @@ -750,24 +750,14 @@ def UninitializedObjectChecker: Checker<"UninitializedObject">, ]>, Documentation; -def VirtualCallChecker : Checker<"VirtualCall">, - HelpText<"Check virtual function calls during construction/destruction">, - CheckerOptions<[ - CmdLineOption, - CmdLineOption - ]>, - Dependencies<[VirtualCallModeling]>, - Documentation; +def VirtualCallChecker + : Checker<"VirtualCall">, + HelpText<"Check virtual function calls during construction/destruction">, + CheckerOptions<[CmdLineOption]>, + Dependencies<[VirtualCallModeling]>, + Documentation; } // end: "optin.cplusplus" diff --git a/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp index 33a9a07f9d32d..6d9c52e966022 100644 --- a/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp @@ -214,14 +214,11 @@ void ento::registerPureVirtualCallChecker(CheckerManager &Mgr) { void ento::registerVirtualCallChecker(CheckerManager &Mgr) { auto *Chk = Mgr.getChecker(); - if (!Mgr.getAnalyzerOptions().getCheckerBooleanOption( - Mgr.getCurrentCheckerName(), "PureOnly")) { - Chk->BT_Impure = std::make_unique( - Mgr.getCurrentCheckerName(), "Unexpected loss of virtual dispatch", - categories::CXXObjectLifecycle); - Chk->ShowFixIts = Mgr.getAnalyzerOptions().getCheckerBooleanOption( - Mgr.getCurrentCheckerName(), "ShowFixIts"); - } + Chk->BT_Impure = std::make_unique( + Mgr.getCurrentCheckerName(), "Unexpected loss of virtual dispatch", + categories::CXXObjectLifecycle); + Chk->ShowFixIts = Mgr.getAnalyzerOptions().getCheckerBooleanOption( + Mgr.getCurrentCheckerName(), "ShowFixIts"); } bool ento::shouldRegisterVirtualCallModeling(const CheckerManager &mgr) { diff --git a/clang/test/Analysis/analyzer-config.c b/clang/test/Analysis/analyzer-config.c index 00177769f3243..80cad54b039f4 100644 --- a/clang/test/Analysis/analyzer-config.c +++ b/clang/test/Analysis/analyzer-config.c @@ -108,7 +108,6 @@ // CHECK-NEXT: optin.cplusplus.UninitializedObject:IgnoreRecordsWithField = "" // CHECK-NEXT: optin.cplusplus.UninitializedObject:NotesAsWarnings = false // CHECK-NEXT: optin.cplusplus.UninitializedObject:Pedantic = false -// CHECK-NEXT: optin.cplusplus.VirtualCall:PureOnly = false // CHECK-NEXT: optin.cplusplus.VirtualCall:ShowFixIts = false // CHECK-NEXT: optin.osx.cocoa.localizability.NonLocalizedStringChecker:AggressiveReport = false // CHECK-NEXT: optin.performance.Padding:AllowedPad = 24 diff --git a/clang/test/Analysis/virtualcall.cpp b/clang/test/Analysis/virtualcall.cpp index 80f89d14ea97c..82285b6d12844 100644 --- a/clang/test/Analysis/virtualcall.cpp +++ b/clang/test/Analysis/virtualcall.cpp @@ -6,29 +6,11 @@ // RUN: -analyzer-checker=debug.ExprInspection \ // RUN: -std=c++11 -verify=pure -std=c++11 %s -// RUN: %clang_analyze_cc1 -analyzer-checker=core,optin.cplusplus.VirtualCall \ -// RUN: -analyzer-config \ -// RUN: optin.cplusplus.VirtualCall:PureOnly=true \ -// RUN: -analyzer-checker=debug.ExprInspection \ -// RUN: -std=c++11 -verify=none %s - // RUN: %clang_analyze_cc1 -analyzer-checker=core,cplusplus.PureVirtualCall \ // RUN: -analyzer-checker=optin.cplusplus.VirtualCall \ // RUN: -analyzer-checker=debug.ExprInspection \ // RUN: -std=c++11 -verify=pure,impure -std=c++11 %s -// RUN: %clang_analyze_cc1 -analyzer-checker=core,cplusplus.PureVirtualCall \ -// RUN: -analyzer-checker=optin.cplusplus.VirtualCall \ -// RUN: -analyzer-config \ -// RUN: optin.cplusplus.VirtualCall:PureOnly=true \ -// RUN: -analyzer-checker=debug.ExprInspection \ -// RUN: -std=c++11 -verify=pure %s - - -// We expect no diagnostics when all checks are disabled. -// none-no-diagnostics - - #include "virtualcall.h" void clang_analyzer_warnIfReached();