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/CGExprScalar.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/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index f80304d6de..fde9f03ba7 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1204,8 +1204,10 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) { } Value *ScalarExprEmitter::VisitStmtExpr(const StmtExpr *E) { - return CGF.EmitCompoundStmt(*E->getSubStmt(), - !E->getType()->isVoidType()).getScalarVal(); + RValue value = CGF.EmitCompoundStmt(*E->getSubStmt(), + !E->getType()->isVoidType()); + CGF.EnsureInsertPoint(); + return value.getScalarVal(); } Value *ScalarExprEmitter::VisitBlockDeclRefExpr(const BlockDeclRefExpr *E) { |