2 files changed, 17 insertions, 28 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 0f351be01c2..70fa004de85 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -38,6 +38,21 @@ llvm::AllocaInst *CodeGenFunction::CreateTempAlloca(const llvm::Type *Ty,
 /// expression and compare the result against zero, returning an Int1Ty value.
 llvm::Value *CodeGenFunction::EvaluateExprAsBool(const Expr *E) {
   QualType BoolTy = getContext().BoolTy;
+  if (E->getType()->isMemberFunctionPointerType()) {
+    llvm::Value *Ptr = CreateTempAlloca(ConvertType(E->getType()));
+    EmitAggExpr(E, Ptr, /*VolatileDest=*/false);
+
+    // Get the pointer.
+    llvm::Value *FuncPtr = Builder.CreateStructGEP(Ptr, 0, "src.ptr");
+    FuncPtr = Builder.CreateLoad(FuncPtr);
+
+    llvm::Value *IsNotNull = 
+      Builder.CreateICmpNE(FuncPtr,
+                            llvm::Constant::getNullValue(FuncPtr->getType()),
+                            "tobool");
+
+    return IsNotNull;
+  }
   if (!E->getType()->isAnyComplexType())
     return EmitScalarConversion(EmitScalarExpr(E), E->getType(), BoolTy);
 
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 20da198a287..6f656382365 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -954,34 +954,8 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) {
   case CastExpr::CK_FloatingCast:
     return EmitScalarConversion(Visit(E), E->getType(), DestTy);
 
-  case CastExpr::CK_MemberPointerToBoolean: {
-    const MemberPointerType* T = E->getType()->getAs<MemberPointerType>();
-    
-    if (T->getPointeeType()->isFunctionType()) {
-      // We have a member function pointer.
-      llvm::Value *Ptr = CGF.CreateTempAlloca(ConvertType(E->getType()));
-      
-      CGF.EmitAggExpr(E, Ptr, /*VolatileDest=*/false);
-      
-      // Get the pointer.
-      llvm::Value *FuncPtr = Builder.CreateStructGEP(Ptr, 0, "src.ptr");
-      FuncPtr = Builder.CreateLoad(FuncPtr);
-      
-      llvm::Value *IsNotNull = 
-        Builder.CreateICmpNE(FuncPtr,
-                             llvm::Constant::getNullValue(FuncPtr->getType()),
-                             "tobool");
-      
-      return IsNotNull;
-    }
-   
-    // We have a regular member pointer.
-    Value *Ptr = Visit(const_cast<Expr*>(E));
-    llvm::Value *IsNotNull = 
-      Builder.CreateICmpNE(Ptr, CGF.CGM.EmitNullConstant(E->getType()),
-                           "tobool");
-    return IsNotNull;
-  }
+  case CastExpr::CK_MemberPointerToBoolean:
+    return CGF.EvaluateExprAsBool(E);
   }
 
   // Handle cases where the source is an non-complex type.