From 5b2644fdf57103868b4d3eef57c51aaecc4fb10c Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Tue, 6 Mar 2018 00:18:21 +0000 Subject: [PATCH] [analyzer] [quickfix] Prevent a crash in NamedDecl::getName() git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326755 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Checkers/GCDAsyncSemaphoreChecker.cpp | 6 ++-- test/gcdasyncsemaphorechecker_test.m | 36 ++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/lib/StaticAnalyzer/Checkers/GCDAsyncSemaphoreChecker.cpp b/lib/StaticAnalyzer/Checkers/GCDAsyncSemaphoreChecker.cpp index 48e9e1e762..23ef032bb0 100644 --- a/lib/StaticAnalyzer/Checkers/GCDAsyncSemaphoreChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/GCDAsyncSemaphoreChecker.cpp @@ -88,9 +88,11 @@ void GCDAsyncSemaphoreChecker::checkASTCodeBody(const Decl *D, BugReporter &BR) const { // The pattern is very common in tests, and it is OK to use it there. - if (const auto* ND = dyn_cast(D)) - if (ND->getName().startswith("test")) + if (const auto* ND = dyn_cast(D)) { + std::string DeclName = ND->getNameAsString(); + if (StringRef(DeclName).startswith("test")) return; + } const char *SemaphoreBinding = "semaphore_name"; auto SemaphoreCreateM = callExpr(callsName("dispatch_semaphore_create")); diff --git a/test/gcdasyncsemaphorechecker_test.m b/test/gcdasyncsemaphorechecker_test.m index e65ae3d7fe..a82545a3b6 100644 --- a/test/gcdasyncsemaphorechecker_test.m +++ b/test/gcdasyncsemaphorechecker_test.m @@ -1,5 +1,14 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.osx.GCDAsyncSemaphore %s -fblocks -verify -// +typedef signed char BOOL; +@protocol NSObject - (BOOL)isEqual:(id)object; @end +@interface NSObject {} ++(id)alloc; +-(id)init; +-(id)autorelease; +-(id)copy; +-(id)retain; +@end + typedef int dispatch_semaphore_t; typedef void (^block_t)(); @@ -166,4 +175,29 @@ void warn_with_cast() { dispatch_semaphore_wait((int)sema, 100); // expected-warning{{Possible semaphore performance anti-pattern}} } +@interface Test1 : NSObject +-(void)use_method_warn; +-(void)testNoWarn; +@end + +@implementation Test1 + +-(void)use_method_warn { + dispatch_semaphore_t sema = dispatch_semaphore_create(0); + + func(^{ + dispatch_semaphore_signal(sema); + }); + dispatch_semaphore_wait(sema, 100); // expected-warning{{Possible semaphore performance anti-pattern}} +} + +-(void)testNoWarn { + dispatch_semaphore_t sema = dispatch_semaphore_create(0); + + func(^{ + dispatch_semaphore_signal(sema); + }); + dispatch_semaphore_wait(sema, 100); +} +@end -- 2.40.0