diff options
| author | John McCall <rjmccall@apple.com> | 2011-11-10 08:15:53 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-11-10 08:15:53 +0000 |
| commit | 08ef466048e06328401fd06527b20315902cab19 (patch) | |
| tree | 01f03a622005ef6cc5d4967c1bbed7623bd3380f /clang/lib/CodeGen/CGExprAgg.cpp | |
| parent | d33b2d6b7a7aacb6fe9db39b0b6c529dafba057c (diff) | |
| download | bcm5719-llvm-08ef466048e06328401fd06527b20315902cab19.tar.gz bcm5719-llvm-08ef466048e06328401fd06527b20315902cab19.zip | |
Enter the cleanups for a block outside the enclosing
full-expression. Naturally they're inactive before we enter
the block literal expression. This restores the intended
behavior that blocks belong to their enclosing scope.
There's a useful -O0 / compile-time optimization that we're
missing here with activating cleanups following straight-line
code from their inactive beginnings.
llvm-svn: 144268
Diffstat (limited to 'clang/lib/CodeGen/CGExprAgg.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index 0fda6659635..f3e86fbb449 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -536,7 +536,9 @@ AggExprEmitter::VisitCXXConstructExpr(const CXXConstructExpr *E) { } void AggExprEmitter::VisitExprWithCleanups(ExprWithCleanups *E) { - CGF.EmitExprWithCleanups(E, Dest); + CGF.enterFullExpression(E); + CodeGenFunction::RunCleanupsScope cleanups(CGF); + Visit(E->getSubExpr()); } void AggExprEmitter::VisitCXXScalarValueInitExpr(CXXScalarValueInitExpr *E) { |
