aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-08-22 18:26:35 +0000
committerDouglas Gregor <dgregor@apple.com>2010-08-22 18:26:35 +0000
commitdb68e28c05a67735211e688009890cf834c22e75 (patch)
tree217cbfe0050d9474a55739a118f09ffb4d8a15c6 /lib/CodeGen
parent8c3e554d00d456d5093c21ce8a0c205461279aab (diff)
Eliminate a stale assertion. Fixes Clang self-host.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111782 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
-rw-r--r--lib/CodeGen/CGExprScalar.cpp5
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);