From 16fe35eb2bf60b1374b24eda453b17af4ccd35ca Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Fri, 3 Aug 2012 23:08:39 +0000 Subject: Enhance getImplicitObjectArgument to look through ->*. This only applies in the case where ->* is not overloaded, since it specifically looks for BinaryOperator and not CXXOperatorCallExpr. llvm-svn: 161275 --- clang/lib/AST/ExprCXX.cpp | 7 +++++-- clang/test/Analysis/misc-ps-cxx0x.cpp | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'clang') diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp index fc52649b9c1..3d52e4a5114 100644 --- a/clang/lib/AST/ExprCXX.cpp +++ b/clang/lib/AST/ExprCXX.cpp @@ -434,9 +434,12 @@ SourceRange CXXOperatorCallExpr::getSourceRangeImpl() const { } Expr *CXXMemberCallExpr::getImplicitObjectArgument() const { - if (const MemberExpr *MemExpr = - dyn_cast(getCallee()->IgnoreParens())) + const Expr *Callee = getCallee()->IgnoreParens(); + if (const MemberExpr *MemExpr = dyn_cast(Callee)) return MemExpr->getBase(); + if (const BinaryOperator *BO = dyn_cast(Callee)) + if (BO->getOpcode() == BO_PtrMemD || BO->getOpcode() == BO_PtrMemI) + return BO->getLHS(); // FIXME: Will eventually need to cope with member pointers. return 0; diff --git a/clang/test/Analysis/misc-ps-cxx0x.cpp b/clang/test/Analysis/misc-ps-cxx0x.cpp index e1c78ed0723..8e31c8db8c9 100644 --- a/clang/test/Analysis/misc-ps-cxx0x.cpp +++ b/clang/test/Analysis/misc-ps-cxx0x.cpp @@ -109,3 +109,10 @@ void test_ic_null(TestInstanceCall *p) { p->foo(); // expected-warning {{Called C++ object pointer is null}} } +void test_ic_member_ptr() { + TestInstanceCall *p = 0; + typedef void (TestInstanceCall::*IC_Ptr)(); + IC_Ptr bar = &TestInstanceCall::foo; + (p->*bar)(); // expected-warning {{Called C++ object pointer is null}} +} + -- cgit v1.2.3