diff options
author | John McCall <rjmccall@apple.com> | 2012-04-06 18:20:53 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2012-04-06 18:20:53 +0000 |
commit | 7f39d51d9c8f551fd09c1feee3d8033f5702b2cb (patch) | |
tree | c0f471cc0d4db0fbe50b9be0a756809dc9620ddf /lib/Sema | |
parent | 40f45ee42bb81ab3dfd5436d9c0e24fc5331034b (diff) |
Fix a Sema invariant bug that I recently introduced involving
the template instantiation of statement-expressions.
I think it was jyasskin who had a crashing testcase in this area;
hopefully this fixes it and he can find his testcase and check it in.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154189 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema')
-rw-r--r-- | lib/Sema/SemaExpr.cpp | 3 | ||||
-rw-r--r-- | lib/Sema/TreeTransform.h | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 709b944447..82d23783f9 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -8567,6 +8567,9 @@ void Sema::ActOnStartStmtExpr() { } void Sema::ActOnStmtExprError() { + // Note that function is also called by TreeTransform when leaving a + // StmtExpr scope without rebuilding anything. + DiscardCleanupsInEvaluationContext(); PopExpressionEvaluationContext(); } diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index f16b667a65..fdb861eea5 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -6736,14 +6736,20 @@ TreeTransform<Derived>::TransformAddrLabelExpr(AddrLabelExpr *E) { template<typename Derived> ExprResult TreeTransform<Derived>::TransformStmtExpr(StmtExpr *E) { + SemaRef.ActOnStartStmtExpr(); StmtResult SubStmt = getDerived().TransformCompoundStmt(E->getSubStmt(), true); - if (SubStmt.isInvalid()) + if (SubStmt.isInvalid()) { + SemaRef.ActOnStmtExprError(); return ExprError(); + } if (!getDerived().AlwaysRebuild() && - SubStmt.get() == E->getSubStmt()) + SubStmt.get() == E->getSubStmt()) { + // Calling this an 'error' is unintuitive, but it does the right thing. + SemaRef.ActOnStmtExprError(); return SemaRef.MaybeBindToTemporary(E); + } return getDerived().RebuildStmtExpr(E->getLParenLoc(), SubStmt.get(), |