An insomniac stab at making block declarations list the variables they close

on, as well as more reliably limiting invalid references to locals from
nested scopes.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124721 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 16 insertions, 3 deletions

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index b1da849ae1..db69e0878a 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -2104,8 +2104,21 @@ void BlockDecl::setParams(ParmVarDecl **NewParamInfo,
   }
 }
 
-unsigned BlockDecl::getNumParams() const {
-  return NumParams;
+void BlockDecl::setCapturedDecls(ASTContext &Context,
+                                 VarDecl * const *begin,
+                                 VarDecl * const *end,
+                                 bool capturesCXXThis) {
+  CapturesCXXThis = capturesCXXThis;
+
+  if (begin == end) {
+    NumCapturedDecls = 0;
+    CapturedDecls = 0;
+    return;
+  }
+
+  NumCapturedDecls = end - begin;
+  CapturedDecls = new (Context) VarDecl*[NumCapturedDecls];
+  memcpy(CapturedDecls, begin, NumCapturedDecls * sizeof(VarDecl*));
 }
 
 SourceRange BlockDecl::getSourceRange() const {
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 7c3fc63e42..0a7a9d22cf 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -462,7 +462,7 @@ public:
       { return Success(E); }
   bool VisitCallExpr(CallExpr *E);
   bool VisitBlockExpr(BlockExpr *E) {
-    if (!E->hasBlockDeclRefExprs())
+    if (!E->getBlockDecl()->hasCaptures())
       return Success(E);
     return false;
   }