summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaChecking.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2012-06-21 18:51:10 +0000
committerDavid Blaikie <dblaikie@gmail.com>2012-06-21 18:51:10 +0000
commit8cf439f85a0dafd8794af48c7ad6660c28deb568 (patch)
tree4544f3e642c3c4906497b457f401e7bb782e2384 /clang/lib/Sema/SemaChecking.cpp
parent582e8a5d4231080827ac07cb4e65d8df74e3a4ed (diff)
downloadbcm5719-llvm-8cf439f85a0dafd8794af48c7ad6660c28deb568.tar.gz
bcm5719-llvm-8cf439f85a0dafd8794af48c7ad6660c28deb568.zip
PR13165: False positive when initializing member data pointers with NULL.
This now correctly covers, I believe, all the pointer types: * 'any' pointers (both function and data normal pointers and ObjC object pointers) * member pointers (both function and data) * block pointers llvm-svn: 158931
Diffstat (limited to 'clang/lib/Sema/SemaChecking.cpp')
-rw-r--r--clang/lib/Sema/SemaChecking.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index fe5e8aca3dd..ef7dc8819f8 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -4432,8 +4432,7 @@ void CheckImplicitConversion(Sema &S, Expr *E, QualType T,
if ((E->isNullPointerConstant(S.Context, Expr::NPC_ValueDependentIsNotNull)
== Expr::NPCK_GNUNull) && !Target->isAnyPointerType()
- && !Target->isBlockPointerType() && !Target->isFunctionPointerType()
- && !Target->isMemberFunctionPointerType()) {
+ && !Target->isBlockPointerType() && !Target->isMemberPointerType()) {
SourceLocation Loc = E->getSourceRange().getBegin();
if (Loc.isMacroID())
Loc = S.SourceMgr.getImmediateExpansionRange(Loc).first;
OpenPOWER on IntegriCloud