Handle CK_NullToMemberPointer in ScalarExprEmitter::EmitCast

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

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index d94ee5bed218173dc281d4bfb84f78420c7c58b3..0524b447180fdccb81610f049af2b9875434df3f 100644 (file)
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -656,7 +656,14 @@ Value *ScalarExprEmitter::EmitCastExpr(const Expr *E, QualType DestTy,
                                        CastExpr::CastKind Kind) {
   if (!DestTy->isVoidType())
     TestAndClearIgnoreResultAssign();
-
+  
+  switch (Kind) {
+  default:
+    break;
+  case CastExpr::CK_NullToMemberPointer:
+    return CGF.CGM.EmitNullConstant(DestTy);
+  }
+  
   // Handle cases where the source is an non-complex type.
   
   if (!CGF.hasAggregateLLVMType(E->getType())) {

diff --git a/test/CodeGenCXX/member-pointers-zero-init.cpp b/test/CodeGenCXX/member-pointers-zero-init.cpp
index d533600b54dbd5cf4146b59ebe5c1ed49376abdf..e7b0fdafba6a34ac05608a8d366bb6310dc9d14c 100644 (file)
--- a/test/CodeGenCXX/member-pointers-zero-init.cpp
+++ b/test/CodeGenCXX/member-pointers-zero-init.cpp
@@ -17,11 +17,18 @@ int A::* aaa[2][2];
 int A::* b = 0;
 
 void f() {
-  // RUN: grep "%.* = icmp ne i64 %.*, -1" %t
+  // RUN: grep "%.* = icmp ne i64 %.*, -1" %t | count 2 &&
   if (a) { }
+  if (a != 0) { }
+
+  // RUN: grep "%.* = icmp ne i64 -1, %.*" %t | count 1 &&
+  if (0 != a) { }
   
-  // FIXME: This doesn't yet work
-//  if (a != 0) { }
+  // RUN: grep "%.* = icmp eq i64 %.*, -1" %t | count 1 &&
+  if (a == 0) { }
+
+  // RUN: grep "%.* = icmp eq i64 -1, %.*" %t | count 1
+  if (0 == a) { }
     
 }