From 84fa510aa9ee3ee97ded906fe4635c2952596fe9 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sun, 22 Aug 2010 04:16:24 +0000 Subject: Abstract more member-pointerness out. llvm-svn: 111771 --- clang/lib/CodeGen/CGExprAgg.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'clang/lib/CodeGen/CGExprAgg.cpp') diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index 7b198bc..1f8964d 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -293,15 +293,9 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) { if (E->getSubExpr()->getType()->isNullPtrType()) Visit(E->getSubExpr()); - const llvm::Type *PtrDiffTy = - CGF.ConvertType(CGF.getContext().getPointerDiffType()); - - llvm::Value *NullValue = llvm::Constant::getNullValue(PtrDiffTy); - llvm::Value *Ptr = Builder.CreateStructGEP(DestPtr, 0, "ptr"); - Builder.CreateStore(NullValue, Ptr, VolatileDest); - - llvm::Value *Adj = Builder.CreateStructGEP(DestPtr, 1, "adj"); - Builder.CreateStore(NullValue, Adj, VolatileDest); + CGF.CGM.getCXXABI().EmitNullMemberFunctionPointer(CGF, + E->getType()->getAs(), + DestPtr, VolatileDest); break; } @@ -329,8 +323,8 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) { // ABIs where an actual null check is thus required; fortunately, // the Itanium and ARM ABIs ignore the adjustment value when // considering null-ness. - CGF.CGM.getCXXABI().EmitMemberPointerConversion(CGF, E, Src, - DestPtr, VolatileDest); + CGF.CGM.getCXXABI().EmitMemberFunctionPointerConversion(CGF, E, Src, + DestPtr, VolatileDest); break; } } -- cgit v1.1