commit 443c21266f189ed48c32cadf72c463e9b992b3eb
author Douglas Gregor <dgregor@apple.com> Sat Aug 07 13:36:37 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Sat Aug 07 13:36:37 2010 +0000
tree 99ba8f48bd3ab2a9a1f3e9ce344ca3eac243e3e4
parent 59c451ef236ec5af8fecc7291f5cb87a3ea6e799

Integral-to-pointer conversions are not always null -> member pointer
conversions. Fixes PR7443.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110519 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 920c235..96ac69c 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -5598,13 +5598,19 @@
     if (RHSIsNull &&
         (lType->isPointerType() ||
          (!isRelational && lType->isMemberPointerType()))) {
-      ImpCastExprToType(rex, lType, CastExpr::CK_NullToMemberPointer);
+      ImpCastExprToType(rex, lType, 
+                        lType->isMemberPointerType()
+                          ? CastExpr::CK_NullToMemberPointer
+                          : CastExpr::CK_IntegralToPointer);
       return ResultTy;
     }
     if (LHSIsNull &&
         (rType->isPointerType() ||
          (!isRelational && rType->isMemberPointerType()))) {
-      ImpCastExprToType(lex, rType, CastExpr::CK_NullToMemberPointer);
+      ImpCastExprToType(lex, rType, 
+                        rType->isMemberPointerType()
+                          ? CastExpr::CK_NullToMemberPointer
+                          : CastExpr::CK_IntegralToPointer);
       return ResultTy;
     }