WIP

[nickdesaulniers]

Summary

Alternate to D155522 based on
https://reviews.llvm.org/D155342#4507805

[rjmccall]

clang/lib/Sema/JumpDiagnostics.cpp

362

I would indent this at the same level as the case labels, and group it with them, too, but yeah, this is what I was thinking. But the helper function approach looks pretty clean, too. Your choice.

[nickdesaulniers]

clang/lib/Sema/JumpDiagnostics.cpp

362

I don't feel strongly either way. I'll fix up the indentation then squash this down into D155342; this is fewer lines changed than D155522.

clang/lib/Sema/JumpDiagnostics.cpp

void JumpScopeChecker::BuildScopeInformation(Stmt *S,
   }
 
   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
     // operand (to avoid recording the address-of-label use), which
     // works only because of the restricted set of expressions which
     // we detect as constant targets.
-    if (cast<IndirectGotoStmt>(S)->getConstantTarget()) {
-      LabelAndGotoScopes[S] = ParentScope;
-      Jumps.push_back(S);
-      return;
-    }
+    if (cast<IndirectGotoStmt>(S)->getConstantTarget())
+      goto RecordJumpScope;
 
     LabelAndGotoScopes[S] = ParentScope;
     IndirectJumps.push_back(S);
     break;
 
   case Stmt::SwitchStmtClass:
     // Evaluate the C++17 init stmt and condition variable
     // before entering the scope of the switch statement.
     if (Stmt *Init = cast<SwitchStmt>(S)->getInit()) {
       BuildScopeInformation(Init, ParentScope);
       ++StmtsToSkip;
     }
     if (VarDecl *Var = cast<SwitchStmt>(S)->getConditionVariable()) {
       BuildScopeInformation(Var, ParentScope);
       ++StmtsToSkip;
     }
-    [[fallthrough]];
+    goto RecordJumpScope;
 
-  case Stmt::GotoStmtClass:
   case Stmt::GCCAsmStmtClass:
-    if (auto *GS = dyn_cast<GCCAsmStmt>(S))
-      if (!GS->isAsmGoto())
-        break;
+    if (!cast<GCCAsmStmt>(S)->isAsmGoto())
+    goto RecordJumpScope;
+
+  case Stmt::GotoStmtClass:
     // Remember both what scope a goto is in as well as the fact that we have
     // it.  This makes the second scan not have to walk the AST again.
+RecordJumpScope:
     LabelAndGotoScopes[S] = ParentScope;
     Jumps.push_back(S);
     break;
 
   case Stmt::IfStmtClass: {
     IfStmt *IS = cast<IfStmt>(S);
     if (!(IS->isConstexpr() || IS->isConsteval() ||
           IS->isObjCAvailabilityCheck()))