diff options
| -rw-r--r-- | lib/Sema/TreeTransform.h | 14 | ||||
| -rw-r--r-- | test/SemaObjCXX/foreach.mm | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index bdd68a7bde..f68de26cde 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -1338,6 +1338,20 @@ public: Expr *Cond, Expr *Inc, Stmt *LoopVar, SourceLocation RParenLoc) { + // If we've just learned that the range is actually an Objective-C + // collection, treat this as an Objective-C fast enumeration loop. + if (DeclStmt *RangeStmt = dyn_cast<DeclStmt>(Range)) { + if (RangeStmt->isSingleDecl()) { + if (VarDecl *RangeVar = dyn_cast<VarDecl>(RangeStmt->getSingleDecl())) { + Expr *RangeExpr = RangeVar->getInit(); + if (!RangeExpr->isTypeDependent() && + RangeExpr->getType()->isObjCObjectPointerType()) + return getSema().ActOnObjCForCollectionStmt(ForLoc, LoopVar, RangeExpr, + RParenLoc); + } + } + } + return getSema().BuildCXXForRangeStmt(ForLoc, ColonLoc, Range, BeginEnd, Cond, Inc, LoopVar, RParenLoc, Sema::BFRK_Rebuild); diff --git a/test/SemaObjCXX/foreach.mm b/test/SemaObjCXX/foreach.mm index ec6ed0550e..ac787bd09e 100644 --- a/test/SemaObjCXX/foreach.mm +++ b/test/SemaObjCXX/foreach.mm @@ -16,6 +16,14 @@ void f(NSArray *a) { for (auto thisKey : keys) { } // expected-warning{{'auto' deduced as 'id' in declaration of 'thisKey'}} } +template<typename Collection> +void ft(Collection col) { + for (id x : col) { } + for (auto x : col) { } +} + +template void ft(NSArray *); + /* // rdar://9072298 */ @protocol NSObject @end |