From d14025acfe64e146bb5f7323c556d11d4d58fb72 Mon Sep 17 00:00:00 2001 From: Artem Dergachev Date: Wed, 3 May 2017 11:47:13 +0000 Subject: [PATCH] [analyzer] Fix memory error bug category capitalization. It was written as "Memory Error" in most places and as "Memory error" in a few other places, however it is the latter that is more consistent with other categories (such as "Logic error"). rdar://problem/31718115 Differential Revision: https://reviews.llvm.org/D32702 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@302016 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Core/BugReporter/CommonBugCategories.h | 1 + lib/StaticAnalyzer/Checkers/MallocChecker.cpp | 33 +++++++++-------- .../Checkers/NullabilityChecker.cpp | 2 +- lib/StaticAnalyzer/Checkers/ValistChecker.cpp | 5 +-- .../Core/CommonBugCategories.cpp | 1 + .../MismatchedDeallocator-path-notes.cpp | 2 +- test/Analysis/NewDelete-path-notes.cpp | 4 +-- .../report-issues-within-main-file.cpp | 2 +- test/Analysis/edges-new.mm | 4 +-- test/Analysis/malloc-plist.c | 36 +++++++++---------- test/Analysis/plist-macros.cpp | 4 +-- 11 files changed, 50 insertions(+), 44 deletions(-) diff --git a/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h b/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h index 8df2bc331b..0e80e7bc19 100644 --- a/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h +++ b/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h @@ -17,6 +17,7 @@ namespace clang { extern const char * const CoreFoundationObjectiveC; extern const char * const LogicError; extern const char * const MemoryCoreFoundationObjectiveC; + extern const char * const MemoryError; extern const char * const UnixAPI; } } diff --git a/lib/StaticAnalyzer/Checkers/MallocChecker.cpp b/lib/StaticAnalyzer/Checkers/MallocChecker.cpp index 9a7e83c149..851114004b 100644 --- a/lib/StaticAnalyzer/Checkers/MallocChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/MallocChecker.cpp @@ -19,6 +19,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" +#include "clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h" #include "clang/StaticAnalyzer/Core/Checker.h" #include "clang/StaticAnalyzer/Core/CheckerManager.h" #include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h" @@ -1753,8 +1754,8 @@ void MallocChecker::ReportBadFree(CheckerContext &C, SVal ArgVal, if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_BadFree[*CheckKind]) - BT_BadFree[*CheckKind].reset( - new BugType(CheckNames[*CheckKind], "Bad free", "Memory Error")); + BT_BadFree[*CheckKind].reset(new BugType( + CheckNames[*CheckKind], "Bad free", categories::MemoryError)); SmallString<100> buf; llvm::raw_svector_ostream os(buf); @@ -1798,8 +1799,8 @@ void MallocChecker::ReportFreeAlloca(CheckerContext &C, SVal ArgVal, if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_FreeAlloca[*CheckKind]) - BT_FreeAlloca[*CheckKind].reset( - new BugType(CheckNames[*CheckKind], "Free alloca()", "Memory Error")); + BT_FreeAlloca[*CheckKind].reset(new BugType( + CheckNames[*CheckKind], "Free alloca()", categories::MemoryError)); auto R = llvm::make_unique( *BT_FreeAlloca[*CheckKind], @@ -1824,7 +1825,7 @@ void MallocChecker::ReportMismatchedDealloc(CheckerContext &C, if (!BT_MismatchedDealloc) BT_MismatchedDealloc.reset( new BugType(CheckNames[CK_MismatchedDeallocatorChecker], - "Bad deallocator", "Memory Error")); + "Bad deallocator", categories::MemoryError)); SmallString<100> buf; llvm::raw_svector_ostream os(buf); @@ -1884,8 +1885,8 @@ void MallocChecker::ReportOffsetFree(CheckerContext &C, SVal ArgVal, return; if (!BT_OffsetFree[*CheckKind]) - BT_OffsetFree[*CheckKind].reset( - new BugType(CheckNames[*CheckKind], "Offset free", "Memory Error")); + BT_OffsetFree[*CheckKind].reset(new BugType( + CheckNames[*CheckKind], "Offset free", categories::MemoryError)); SmallString<100> buf; llvm::raw_svector_ostream os(buf); @@ -1936,7 +1937,7 @@ void MallocChecker::ReportUseAfterFree(CheckerContext &C, SourceRange Range, if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_UseFree[*CheckKind]) BT_UseFree[*CheckKind].reset(new BugType( - CheckNames[*CheckKind], "Use-after-free", "Memory Error")); + CheckNames[*CheckKind], "Use-after-free", categories::MemoryError)); auto R = llvm::make_unique(*BT_UseFree[*CheckKind], "Use of memory after it is freed", N); @@ -1962,8 +1963,8 @@ void MallocChecker::ReportDoubleFree(CheckerContext &C, SourceRange Range, if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_DoubleFree[*CheckKind]) - BT_DoubleFree[*CheckKind].reset( - new BugType(CheckNames[*CheckKind], "Double free", "Memory Error")); + BT_DoubleFree[*CheckKind].reset(new BugType( + CheckNames[*CheckKind], "Double free", categories::MemoryError)); auto R = llvm::make_unique( *BT_DoubleFree[*CheckKind], @@ -1991,7 +1992,8 @@ void MallocChecker::ReportDoubleDelete(CheckerContext &C, SymbolRef Sym) const { if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_DoubleDelete) BT_DoubleDelete.reset(new BugType(CheckNames[CK_NewDeleteChecker], - "Double delete", "Memory Error")); + "Double delete", + categories::MemoryError)); auto R = llvm::make_unique( *BT_DoubleDelete, "Attempt to delete released memory", N); @@ -2017,8 +2019,9 @@ void MallocChecker::ReportUseZeroAllocated(CheckerContext &C, if (ExplodedNode *N = C.generateErrorNode()) { if (!BT_UseZerroAllocated[*CheckKind]) - BT_UseZerroAllocated[*CheckKind].reset(new BugType( - CheckNames[*CheckKind], "Use of zero allocated", "Memory Error")); + BT_UseZerroAllocated[*CheckKind].reset( + new BugType(CheckNames[*CheckKind], "Use of zero allocated", + categories::MemoryError)); auto R = llvm::make_unique(*BT_UseZerroAllocated[*CheckKind], "Use of zero-allocated memory", N); @@ -2253,8 +2256,8 @@ void MallocChecker::reportLeak(SymbolRef Sym, ExplodedNode *N, assert(N); if (!BT_Leak[*CheckKind]) { - BT_Leak[*CheckKind].reset( - new BugType(CheckNames[*CheckKind], "Memory leak", "Memory Error")); + BT_Leak[*CheckKind].reset(new BugType(CheckNames[*CheckKind], "Memory leak", + categories::MemoryError)); // Leaks should not be reported if they are post-dominated by a sink: // (1) Sinks are higher importance bugs. // (2) NoReturnFunctionChecker uses sink nodes to represent paths ending diff --git a/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp b/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp index 21527d8c34..41999d2527 100644 --- a/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp @@ -178,7 +178,7 @@ private: const MemRegion *Region, BugReporter &BR, const Stmt *ValueExpr = nullptr) const { if (!BT) - BT.reset(new BugType(this, "Nullability", "Memory error")); + BT.reset(new BugType(this, "Nullability", categories::MemoryError)); auto R = llvm::make_unique(*BT, Msg, N); if (Region) { diff --git a/lib/StaticAnalyzer/Checkers/ValistChecker.cpp b/lib/StaticAnalyzer/Checkers/ValistChecker.cpp index d12ba62580..06c4ef71d8 100644 --- a/lib/StaticAnalyzer/Checkers/ValistChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/ValistChecker.cpp @@ -256,7 +256,7 @@ void ValistChecker::reportUninitializedAccess(const MemRegion *VAList, if (!BT_uninitaccess) BT_uninitaccess.reset(new BugType(CheckNames[CK_Uninitialized], "Uninitialized va_list", - "Memory Error")); + categories::MemoryError)); auto R = llvm::make_unique(*BT_uninitaccess, Msg, N); R->markInteresting(VAList); R->addVisitor(llvm::make_unique(VAList)); @@ -274,7 +274,8 @@ void ValistChecker::reportLeakedVALists(const RegionVector &LeakedVALists, for (auto Reg : LeakedVALists) { if (!BT_leakedvalist) { BT_leakedvalist.reset(new BugType(CheckNames[CK_Unterminated], - "Leaked va_list", "Memory Error")); + "Leaked va_list", + categories::MemoryError)); BT_leakedvalist->setSuppressOnSink(true); } diff --git a/lib/StaticAnalyzer/Core/CommonBugCategories.cpp b/lib/StaticAnalyzer/Core/CommonBugCategories.cpp index 3cb9323563..421dfa48c9 100644 --- a/lib/StaticAnalyzer/Core/CommonBugCategories.cpp +++ b/lib/StaticAnalyzer/Core/CommonBugCategories.cpp @@ -16,5 +16,6 @@ const char * const CoreFoundationObjectiveC = "Core Foundation/Objective-C"; const char * const LogicError = "Logic error"; const char * const MemoryCoreFoundationObjectiveC = "Memory (Core Foundation/Objective-C)"; +const char * const MemoryError = "Memory error"; const char * const UnixAPI = "Unix API"; }}} diff --git a/test/Analysis/MismatchedDeallocator-path-notes.cpp b/test/Analysis/MismatchedDeallocator-path-notes.cpp index 118f23bca1..1354386fc8 100644 --- a/test/Analysis/MismatchedDeallocator-path-notes.cpp +++ b/test/Analysis/MismatchedDeallocator-path-notes.cpp @@ -287,7 +287,7 @@ void test() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionMemory allocated by 'new[]' should be deallocated by 'delete[]', not 'delete' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeBad deallocator // CHECK-NEXT: check_nameunix.MismatchedDeallocator // CHECK-NEXT: diff --git a/test/Analysis/NewDelete-path-notes.cpp b/test/Analysis/NewDelete-path-notes.cpp index 115a4addca..ac760ca60e 100644 --- a/test/Analysis/NewDelete-path-notes.cpp +++ b/test/Analysis/NewDelete-path-notes.cpp @@ -257,7 +257,7 @@ void test(Odd *odd) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionAttempt to free released memory -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeDouble free // CHECK-NEXT: check_namecplusplus.NewDelete // CHECK-NEXT: @@ -475,7 +475,7 @@ void test(Odd *odd) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionAttempt to free released memory -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeDouble free // CHECK-NEXT: check_namecplusplus.NewDelete // CHECK-NEXT: diff --git a/test/Analysis/diagnostics/report-issues-within-main-file.cpp b/test/Analysis/diagnostics/report-issues-within-main-file.cpp index 784fdba972..e1dccc8e32 100644 --- a/test/Analysis/diagnostics/report-issues-within-main-file.cpp +++ b/test/Analysis/diagnostics/report-issues-within-main-file.cpp @@ -945,7 +945,7 @@ void callInMacroArg() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionMemory allocated by 'new[]' should be deallocated by 'delete[]', not 'delete' (within a call to '~auto_ptr') -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeBad deallocator // CHECK-NEXT: check_nameunix.MismatchedDeallocator // CHECK-NEXT: diff --git a/test/Analysis/edges-new.mm b/test/Analysis/edges-new.mm index 217cd4aa46..47a125ab09 100644 --- a/test/Analysis/edges-new.mm +++ b/test/Analysis/edges-new.mm @@ -20042,7 +20042,7 @@ namespace rdar14960554 { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'buf' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -20284,7 +20284,7 @@ namespace rdar14960554 { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionMemory allocated by 'new[]' should be deallocated by 'delete[]', not 'delete' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeBad deallocator // CHECK-NEXT: check_nameunix.MismatchedDeallocator // CHECK-NEXT: diff --git a/test/Analysis/malloc-plist.c b/test/Analysis/malloc-plist.c index 26aea16045..e2062e8582 100644 --- a/test/Analysis/malloc-plist.c +++ b/test/Analysis/malloc-plist.c @@ -421,7 +421,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'p' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -586,7 +586,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'A' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -974,7 +974,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'buf' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -1376,7 +1376,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'buf' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -1962,7 +1962,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionUse of memory after it is freed -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeUse-after-free // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -2524,7 +2524,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'buf' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -2795,7 +2795,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'v' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -3144,7 +3144,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionUse of memory after it is freed -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeUse-after-free // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -3309,7 +3309,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'm' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -3517,7 +3517,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -3725,7 +3725,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -4030,7 +4030,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -4335,7 +4335,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -4543,7 +4543,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -4751,7 +4751,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -4988,7 +4988,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential memory leak -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -5225,7 +5225,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential memory leak -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: @@ -5496,7 +5496,7 @@ void testMyMalloc() { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential memory leak -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: diff --git a/test/Analysis/plist-macros.cpp b/test/Analysis/plist-macros.cpp index 594cfdc6ef..18d3ce11e6 100644 --- a/test/Analysis/plist-macros.cpp +++ b/test/Analysis/plist-macros.cpp @@ -218,7 +218,7 @@ void test2(int *p) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionMemory allocated by malloc() should be deallocated by free(), not 'delete' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeBad deallocator // CHECK-NEXT: check_nameunix.MismatchedDeallocator // CHECK-NEXT: @@ -315,7 +315,7 @@ void test2(int *p) { // CHECK-NEXT: // CHECK-NEXT: // CHECK-NEXT: descriptionPotential leak of memory pointed to by 'x' -// CHECK-NEXT: categoryMemory Error +// CHECK-NEXT: categoryMemory error // CHECK-NEXT: typeMemory leak // CHECK-NEXT: check_nameunix.Malloc // CHECK-NEXT: -- 2.40.0