From: Devin Coughlin Date: Sun, 15 Nov 2015 17:48:22 +0000 (+0000) Subject: [analyzer] Handle calling ObjC super method from inside C++ lambda. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8075652dab7bc020c34deba5b89790fa0e3fba50;p=clang [analyzer] Handle calling ObjC super method from inside C++ lambda. When calling a ObjC method on super from inside a C++ lambda, look at the captures to find "self". This mirrors how the analyzer handles calling super in an ObjC block and fixes an assertion failure. rdar://problem/23550077 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253176 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Analysis/AnalysisDeclContext.cpp b/lib/Analysis/AnalysisDeclContext.cpp index d7fb7e95d7..52c7f26136 100644 --- a/lib/Analysis/AnalysisDeclContext.cpp +++ b/lib/Analysis/AnalysisDeclContext.cpp @@ -148,6 +148,23 @@ const ImplicitParamDecl *AnalysisDeclContext::getSelfDecl() const { } } + auto *CXXMethod = dyn_cast(D); + if (!CXXMethod) + return nullptr; + + const CXXRecordDecl *parent = CXXMethod->getParent(); + if (!parent->isLambda()) + return nullptr; + + for (const LambdaCapture &LC : parent->captures()) { + if (!LC.capturesVariable()) + continue; + + VarDecl *VD = LC.getCapturedVar(); + if (VD->getName() == "self") + return dyn_cast(VD); + } + return nullptr; } diff --git a/test/Analysis/lambdas.mm b/test/Analysis/lambdas.mm new file mode 100644 index 0000000000..f2cd5aefff --- /dev/null +++ b/test/Analysis/lambdas.mm @@ -0,0 +1,46 @@ +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -Wno-objc-root-class -analyze -analyzer-checker=core,debug.ExprInspection -analyzer-config inline-lambdas=true -verify %s + +int clang_analyzer_eval(int); + +@interface Super +- (void)superMethod; +@end + +@interface Sub : Super { + int _ivar1; + int _ivar2; +} +@end + + +@implementation Sub +- (void)callMethodOnSuperInCXXLambda; { + // Explicit capture. + [self]() { + [super superMethod]; + }(); + + // Implicit capture. + [=]() { + [super superMethod]; + }(); +} + +- (void)swapIvars { + int tmp = _ivar1; + _ivar1 = _ivar2; + _ivar2 = tmp; +} + +- (void)callMethodOnSelfInCXXLambda; { + _ivar1 = 7; + _ivar2 = 8; + [self]() { + [self swapIvars]; + }(); + + clang_analyzer_eval(_ivar1 == 8); // expected-warning{{TRUE}} + clang_analyzer_eval(_ivar2 == 7); // expected-warning{{TRUE}} +} + +@end