Fix another case (this time in JumpScopeChecker) where walking deeply nested CaseStmts can blow out the stack. Fixes <rdar://problem/8125165>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110071 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/JumpDiagnostics.cpp b/lib/Sema/JumpDiagnostics.cpp
index 3431ac6..f696d6a 100644
--- a/lib/Sema/JumpDiagnostics.cpp
+++ b/lib/Sema/JumpDiagnostics.cpp
@@ -182,9 +182,19 @@
switch (S->getStmtClass()) {
case Stmt::LabelStmtClass:
case Stmt::DefaultStmtClass:
- case Stmt::CaseStmtClass:
LabelAndGotoScopes[S] = ParentScope;
break;
+ case Stmt::CaseStmtClass: {
+ // Specially handle CaseStmts since they can nest each other in the
+ // AST and blow out the stack when we walk them.
+ CaseStmt *CS = cast<CaseStmt>(S);
+ do {
+ LabelAndGotoScopes[CS] = ParentScope;
+ S = CS; // 'CS' is the new current statement (if it isn't already).
+ CS = dyn_cast<CaseStmt>(CS->getSubStmt());
+ } while (CS);
+ break;
+ }
case Stmt::AddrLabelExprClass:
IndirectJumpTargets.push_back(cast<AddrLabelExpr>(S)->getLabel());