From 294c2db42bbef486b55297fcde31e89a88998c69 Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 13 Jan 2011 02:03:06 +0000 Subject: Ensure an insertion point at the end of a statement-expression. Fixes PR8967. llvm-svn: 123360 --- clang/lib/CodeGen/CGExprComplex.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/lib/CodeGen/CGExprComplex.cpp') diff --git a/clang/lib/CodeGen/CGExprComplex.cpp b/clang/lib/CodeGen/CGExprComplex.cpp index cf1e3f1..5c4d0a56 100644 --- a/clang/lib/CodeGen/CGExprComplex.cpp +++ b/clang/lib/CodeGen/CGExprComplex.cpp @@ -313,8 +313,7 @@ ComplexPairTy ComplexExprEmitter::VisitExpr(Expr *E) { ComplexPairTy ComplexExprEmitter:: VisitImaginaryLiteral(const ImaginaryLiteral *IL) { llvm::Value *Imag = CGF.EmitScalarExpr(IL->getSubExpr()); - return - ComplexPairTy(llvm::Constant::getNullValue(Imag->getType()), Imag); + return ComplexPairTy(llvm::Constant::getNullValue(Imag->getType()), Imag); } @@ -326,7 +325,9 @@ ComplexPairTy ComplexExprEmitter::VisitCallExpr(const CallExpr *E) { } ComplexPairTy ComplexExprEmitter::VisitStmtExpr(const StmtExpr *E) { - return CGF.EmitCompoundStmt(*E->getSubStmt(), true).getComplexVal(); + RValue result = CGF.EmitCompoundStmt(*E->getSubStmt(), true); + CGF.EnsureInsertPoint(); + return result.getComplexVal(); } /// EmitComplexToComplexCast - Emit a cast from complex value Val to DestType. @@ -635,7 +636,6 @@ ComplexPairTy ComplexExprEmitter::VisitBinAssign(const BinaryOperator *E) { ComplexPairTy ComplexExprEmitter::VisitBinComma(const BinaryOperator *E) { CGF.EmitIgnoredExpr(E->getLHS()); - CGF.EnsureInsertPoint(); return Visit(E->getRHS()); } -- cgit v1.1