maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Pop block scope after reading from it. 

Found by valgrind.

llvm-svn: 134983
This commit is contained in:
Benjamin Kramer 2011-07-12 14:11:05 +00:00
parent b804a2b751
commit a4fb836f06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Sema/SemaExpr.cpp
View File

@ -8496,10 +8496,6 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc,
BSI->TheDecl->setBody(cast<CompoundStmt>(Body)); BSI->TheDecl->setBody(cast<CompoundStmt>(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(), for (BlockDecl::capture_const_iterator ci = BSI->TheDecl->capture_begin(),
ce = BSI->TheDecl->capture_end(); ci != ce; ++ci) { ce = BSI->TheDecl->capture_end(); ci != ce; ++ci) {
const VarDecl *variable = ci->getVariable(); const VarDecl *variable = ci->getVariable();
@ -8509,6 +8505,10 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc,
getCurFunction()->setHasBranchProtectedScope(); getCurFunction()->setHasBranchProtectedScope();
} }
BlockExpr *Result = new (Context) BlockExpr(BSI->TheDecl, BlockTy);
const AnalysisBasedWarnings::Policy &WP = AnalysisWarnings.getDefaultPolicy();
PopFunctionOrBlockScope(&WP, Result->getBlockDecl(), Result);
return Owned(Result); return Owned(Result);
} }