Fix <rdar://problem/6252226> parser thinks block argument is undefined identifier in NSServices.m
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56761 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index e8b4d8c..dfa53ac 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -366,9 +366,14 @@
}
// If we are parsing a block, check the block parameter list.
if (CurBlock) {
- for (unsigned i = 0, e = CurBlock->Params.size(); i != e; ++i)
- if (CurBlock->Params[i]->getIdentifier() == &II)
- D = CurBlock->Params[i];
+ BlockSemaInfo *BLK = CurBlock;
+ do {
+ for (unsigned i = 0, e = BLK->Params.size(); i != e && D == 0; ++i)
+ if (BLK->Params[i]->getIdentifier() == &II)
+ D = BLK->Params[i];
+ if (D)
+ break; // Found!
+ } while ((BLK = BLK->PrevBlockInfo)); // Look through any enclosing blocks.
}
if (D == 0) {
// Otherwise, this could be an implicitly declared function reference (legal