diff options
| author | John McCall <rjmccall@apple.com> | 2011-01-13 02:03:06 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-01-13 02:03:06 +0000 |
| commit | 8d3d6c93551cc62c6d550f090991bfba1d32d0a4 (patch) | |
| tree | 359d40b2617eac1b8b46e5efdccbf43969d94bcc /lib/CodeGen/CGExprComplex.cpp | |
| parent | 48aef3625a0a80d044b40f872355990134ee7598 (diff) | |
Ensure an insertion point at the end of a statement-expression.
Fixes PR8967.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123360 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprComplex.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprComplex.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp index cf1e3f11c4..5c4d0a5608 100644 --- a/lib/CodeGen/CGExprComplex.cpp +++ b/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()); } |