From d248619cd1a5e13bb8fb19e97e3e923d792bfea3 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 12 Jul 2011 14:11:05 +0000 Subject: [PATCH] Pop block scope after reading from it. Found by valgrind. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134983 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 1e04ac734e..9f91052e4c 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -8496,10 +8496,6 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc, BSI->TheDecl->setBody(cast(Body)); - BlockExpr *Result = new (Context) BlockExpr(BSI->TheDecl, BlockTy); - - const AnalysisBasedWarnings::Policy &WP = AnalysisWarnings.getDefaultPolicy(); - PopFunctionOrBlockScope(&WP, Result->getBlockDecl(), Result); for (BlockDecl::capture_const_iterator ci = BSI->TheDecl->capture_begin(), ce = BSI->TheDecl->capture_end(); ci != ce; ++ci) { const VarDecl *variable = ci->getVariable(); @@ -8509,6 +8505,10 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc, getCurFunction()->setHasBranchProtectedScope(); } + BlockExpr *Result = new (Context) BlockExpr(BSI->TheDecl, BlockTy); + const AnalysisBasedWarnings::Policy &WP = AnalysisWarnings.getDefaultPolicy(); + PopFunctionOrBlockScope(&WP, Result->getBlockDecl(), Result); + return Owned(Result); } -- 2.40.0