diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 38a49ee138..4d4ddd948c 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -569,12 +569,9 @@ EmitComplexToScalarConversion(CodeGenFunction::ComplexPairTy Src, Value *ScalarExprEmitter::EmitNullValue(QualType Ty) { const llvm::Type *LTy = ConvertType(Ty); - if (!Ty->isMemberPointerType()) + if (!Ty->isMemberDataPointerType()) return llvm::Constant::getNullValue(LTy); - assert(!Ty->isMemberFunctionPointerType() && - "member function pointers are not scalar!"); - // Itanium C++ ABI 2.3: // A NULL pointer is represented as -1. return llvm::ConstantInt::get(LTy, -1ULL, /*isSigned=*/true); |