commit 5fd33e0d1a5e3b1611a9dd33cb1acd9b60a74c34
author David Majnemer <david.majnemer@gmail.com> Fri Apr 24 01:25:08 2015 +0000
committer David Majnemer <david.majnemer@gmail.com> Fri Apr 24 01:25:08 2015 +0000
tree 75045b37f1ebbdc2be95537f0501a9f750710e7e
parent e154456d4a7243fef84f66817b23fcb51790880d

Replace getPointeeType()->isFunctionType with isMemberDataPointerType

llvm-svn: 235682

clang/lib/CodeGen/CGExprConstant.cpp

diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index b1cf99c..f94213a 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -1421,8 +1421,7 @@
     return ::EmitNullConstant(*this, RD, /*complete object*/ true);
   }
 
-  assert(T->isMemberPointerType() && "Should only see member pointers here!");
-  assert(!T->getAs<MemberPointerType>()->getPointeeType()->isFunctionType() &&
+  assert(T->isMemberDataPointerType() &&
          "Should only see pointers to data members here!");
 
   return getCXXABI().EmitNullMemberPointer(T->castAs<MemberPointerType>());