diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-08-22 18:26:35 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-08-22 18:26:35 +0000 |
| commit | 932c19dc9f992b07b6d7c07557e27a69c87a87b0 (patch) | |
| tree | 516934dbc5a8feab88a91c3be20f9d3e475b0079 /clang/lib/CodeGen/CGExprScalar.cpp | |
| parent | b0a04fff5185309b8b246b6383cccb8805cf272e (diff) | |
| download | bcm5719-llvm-932c19dc9f992b07b6d7c07557e27a69c87a87b0.tar.gz bcm5719-llvm-932c19dc9f992b07b6d7c07557e27a69c87a87b0.zip | |
Eliminate a stale assertion. Fixes Clang self-host.
llvm-svn: 111782
Diffstat (limited to 'clang/lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 38a49ee138d..4d4ddd948c2 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/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); |
