diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-12-21 02:50:38 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-12-21 02:50:38 +0000 |
| commit | 98ab776a8a9e19c7bf1bd04d610ec2b2c37aef7a (patch) | |
| tree | 1e6f4eceb16367d0a2b5dff24f15563d3864179c /lib/CodeGen/CGExprScalar.cpp | |
| parent | f1e5b155088203f88a8172aa61c1d84185966bf0 (diff) | |
Revert r170806, "Fix some bugs where we would sometimes use 0, not -1, when emitting a null constant of type pointer-to-data-member."
It broke stage2.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170835 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 69f6923963..9071e693f9 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -266,7 +266,7 @@ public: Value *VisitInitListExpr(InitListExpr *E); Value *VisitImplicitValueInitExpr(const ImplicitValueInitExpr *E) { - return EmitNullValue(E->getType()); + return CGF.CGM.EmitNullConstant(E->getType()); } Value *VisitExplicitCastExpr(ExplicitCastExpr *E) { if (E->getType()->isVariablyModifiedType()) @@ -800,7 +800,10 @@ EmitComplexToScalarConversion(CodeGenFunction::ComplexPairTy Src, } Value *ScalarExprEmitter::EmitNullValue(QualType Ty) { - return CGF.CGM.EmitNullConstant(Ty); + if (const MemberPointerType *MPT = Ty->getAs<MemberPointerType>()) + return CGF.CGM.getCXXABI().EmitNullMemberPointer(MPT); + + return llvm::Constant::getNullValue(ConvertType(Ty)); } /// \brief Emit a sanitization check for the given "binary" operation (which |