Final phase of converting BlockDecls over to DeclContext. This is unfortunately a largish/complex diff, however it was necessry to pass all the current block tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57337 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index c8d95cf..d0f5eb2 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -1094,6 +1094,9 @@
// within or outside of the block.
EnterScope(Scope::BlockScope|Scope::FnScope|Scope::BreakScope|
Scope::ContinueScope|Scope::DeclScope);
+
+ // Inform sema that we are starting a block.
+ Actions.ActOnBlockStart(CaretLoc, CurScope);
// Parse the return type if present.
DeclSpec DS;
@@ -1119,7 +1122,7 @@
}
// Inform sema that we are starting a block.
- Actions.ActOnBlockStart(CaretLoc, CurScope, ParamInfo);
+ Actions.ActOnBlockArguments(ParamInfo);
ExprResult Result = true;
if (Tok.is(tok::l_brace)) {