From 8ea46b6654d995678af6ea522d26ae946d2ecd08 Mon Sep 17 00:00:00 2001 From: John McCall Date: Sat, 18 Sep 2010 00:58:34 +0000 Subject: Fix a bug with binding l-values to elided temporaries, and leave a couple helpful asserts behind. llvm-svn: 114250 --- clang/lib/CodeGen/CGExpr.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'clang/lib/CodeGen/CGExpr.cpp') diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 9c1a3cf249ae..924ca3ec4bb9 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -1964,6 +1964,8 @@ LValue CodeGenFunction::EmitVAArgExprLValue(const VAArgExpr *E) { } LValue CodeGenFunction::EmitCXXConstructLValue(const CXXConstructExpr *E) { + assert(E->getType()->getAsCXXRecordDecl()->hasTrivialDestructor() + && "binding l-value to type which needs a temporary"); AggValueSlot Slot = CreateAggTemp(E->getType(), "tmp"); EmitCXXConstructExpr(E, Slot); return MakeAddrLValue(Slot.getAddr(), E->getType()); @@ -1976,9 +1978,11 @@ CodeGenFunction::EmitCXXTypeidLValue(const CXXTypeidExpr *E) { LValue CodeGenFunction::EmitCXXBindTemporaryLValue(const CXXBindTemporaryExpr *E) { - LValue LV = EmitLValue(E->getSubExpr()); - EmitCXXTemporary(E->getTemporary(), LV.getAddress()); - return LV; + AggValueSlot Slot = CreateAggTemp(E->getType(), "temp.lvalue"); + Slot.setLifetimeExternallyManaged(); + EmitAggExpr(E->getSubExpr(), Slot); + EmitCXXTemporary(E->getTemporary(), Slot.getAddr()); + return MakeAddrLValue(Slot.getAddr(), E->getType()); } LValue CodeGenFunction::EmitObjCMessageExprLValue(const ObjCMessageExpr *E) { -- cgit v1.2.3