diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/JumpDiagnostics.cpp | 9 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 1 | ||||
| -rw-r--r-- | clang/test/SemaObjC/foreach.m | 24 |
4 files changed, 36 insertions, 0 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 3912a854918..6cb872cc27c 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -5000,6 +5000,8 @@ def note_protected_by_if_available : Note< "jump enters controlled statement of if available">; def note_protected_by_vla : Note< "jump bypasses initialization of variable length array">; +def note_protected_by_objc_fast_enumeration : Note< + "jump enters Objective-C fast enumeration loop">; def note_protected_by_objc_try : Note< "jump bypasses initialization of @try block">; def note_protected_by_objc_catch : Note< diff --git a/clang/lib/Sema/JumpDiagnostics.cpp b/clang/lib/Sema/JumpDiagnostics.cpp index 899d3fa83cc..865aea9e228 100644 --- a/clang/lib/Sema/JumpDiagnostics.cpp +++ b/clang/lib/Sema/JumpDiagnostics.cpp @@ -287,6 +287,15 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S, IndirectJumpTargets.push_back(cast<AddrLabelExpr>(S)->getLabel()); break; + case Stmt::ObjCForCollectionStmtClass: { + auto *CS = cast<ObjCForCollectionStmt>(S); + unsigned Diag = diag::note_protected_by_objc_fast_enumeration; + unsigned NewParentScope = Scopes.size(); + Scopes.push_back(GotoScope(ParentScope, Diag, 0, S->getLocStart())); + BuildScopeInformation(CS->getBody(), NewParentScope); + return; + } + case Stmt::IndirectGotoStmtClass: // "goto *&&lbl;" is a special case which we treat as equivalent // to a normal goto. In addition, we don't calculate scope in the diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 9be1c56f062..9ffc23b5adb 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -1783,6 +1783,7 @@ StmtResult Sema::ActOnObjCForCollectionStmt(SourceLocation ForLoc, Stmt *First, Expr *collection, SourceLocation RParenLoc) { + getCurFunction()->setHasBranchProtectedScope(); ExprResult CollectionExprResult = CheckObjCForCollectionOperand(ForLoc, collection); diff --git a/clang/test/SemaObjC/foreach.m b/clang/test/SemaObjC/foreach.m index 91ea2ec4e0d..477c4fc3836 100644 --- a/clang/test/SemaObjC/foreach.m +++ b/clang/test/SemaObjC/foreach.m @@ -55,3 +55,27 @@ void test2(NSObject<NSFastEnumeration> *collection) { for (obj.prop in collection) { /* expected-error {{selector element is not a valid lvalue}} */ } } + +int cond(); + +void test3(NSObject<NSFastEnumeration> *a0, NSObject<NSFastEnumeration> *a1) { + for (id i in a0) { /* expected-note 2 {{jump enters Objective-C fast enumeration loop}} */ + for (id j in a1) { /* expected-note 2 {{jump enters Objective-C fast enumeration loop}} */ + (void)i, (void)j; +label0: + if (cond()) + goto label1; + } +label1: + if (cond()) + goto label0; /* expected-error {{cannot jump from this goto statement to its label}} */ + if (cond()) + goto label2; + } + +label2: + if (cond()) + goto label0; /* expected-error {{cannot jump from this goto statement to its label}} */ + if (cond()) + goto label1; /* expected-error{{cannot jump from this goto statement to its label}} */ +} |
