From: Mike Stump Date: Fri, 18 Dec 2009 02:14:27 +0000 (+0000) Subject: Handle case when DestPtr is 0. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd5614b18cbe4c528b0589b4ba722346bdb9fcce;p=clang Handle case when DestPtr is 0. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91658 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index 185d1a2d71..0802e905ea 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -460,6 +460,7 @@ AggExprEmitter::VisitCXXConstructExpr(const CXXConstructExpr *E) { if (E->requiresZeroInitialization()) EmitNullInitializationToLValue(LValue::MakeAddr(Val, + // FIXME: Qualifiers()? E->getType().getQualifiers()), E->getType()); @@ -467,16 +468,34 @@ AggExprEmitter::VisitCXXConstructExpr(const CXXConstructExpr *E) { } void AggExprEmitter::VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E) { - CGF.EmitCXXExprWithTemporaries(E, DestPtr, VolatileDest, IsInitializer); + llvm::Value *Val = DestPtr; + + if (!Val) { + // Create a temporary variable. + Val = CGF.CreateTempAlloca(CGF.ConvertTypeForMem(E->getType()), "tmp"); + } + CGF.EmitCXXExprWithTemporaries(E, Val, VolatileDest, IsInitializer); } void AggExprEmitter::VisitCXXZeroInitValueExpr(CXXZeroInitValueExpr *E) { - LValue LV = LValue::MakeAddr(DestPtr, Qualifiers()); + llvm::Value *Val = DestPtr; + + if (!Val) { + // Create a temporary variable. + Val = CGF.CreateTempAlloca(CGF.ConvertTypeForMem(E->getType()), "tmp"); + } + LValue LV = LValue::MakeAddr(Val, Qualifiers()); EmitNullInitializationToLValue(LV, E->getType()); } void AggExprEmitter::VisitImplicitValueInitExpr(ImplicitValueInitExpr *E) { - LValue LV = LValue::MakeAddr(DestPtr, Qualifiers()); + llvm::Value *Val = DestPtr; + + if (!Val) { + // Create a temporary variable. + Val = CGF.CreateTempAlloca(CGF.ConvertTypeForMem(E->getType()), "tmp"); + } + LValue LV = LValue::MakeAddr(Val, Qualifiers()); EmitNullInitializationToLValue(LV, E->getType()); }