Force AttributedStmtClass to not be scope parents

Author: YutongZhuu

clang/docs/ReleaseNotes.rst

@@ -733,6 +733,8 @@ Improvements to Clang's diagnostics
       scope.Unlock();
       require(scope); // Warning!  Requires mu1.
     }
+    
+- Clang now forces attributes to not be scope parents (#84072).
 
 Improvements to Clang's time-trace
 ----------------------------------

clang/lib/Sema/JumpDiagnostics.cpp

@@ -597,15 +597,6 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S,
     LabelAndGotoScopes[S] = ParentScope;
     break;
 
-  case Stmt::AttributedStmtClass: {
-    AttributedStmt *AS = cast<AttributedStmt>(S);
-    if (GetMustTailAttr(AS)) {
-      LabelAndGotoScopes[AS] = ParentScope;
-      MustTailStmts.push_back(AS);
-    }
-    break;
-  }
-
   case Stmt::OpenACCComputeConstructClass: {
     unsigned NewParentScope = Scopes.size();
     OpenACCComputeConstruct *CC = cast<OpenACCComputeConstruct>(S);
@@ -658,7 +649,13 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S,
         Next = SC->getSubStmt();
       else if (LabelStmt *LS = dyn_cast<LabelStmt>(SubStmt))
         Next = LS->getSubStmt();
-      else
+      else if (AttributedStmt *AS = dyn_cast<AttributedStmt>(SubStmt)) {
+        if (GetMustTailAttr(AS)) {
+          LabelAndGotoScopes[AS] = ParentScope;
+          MustTailStmts.push_back(AS);
+        }
+        Next = AS->getSubStmt();
+      } else
         break;
 
       LabelAndGotoScopes[SubStmt] = ParentScope;

clang/test/CXX/stmt.stmt/stmt.select/stmt.switch/p4.cpp

@@ -0,0 +1,11 @@
+// RUN: %clang++ -fsyntax-only -std=c++20 -Xclang -verify %s
+
+void Func(int x) {
+    switch (x) {
+        [[likely]] case 0:
+        case 1: 
+            int i = 3; // expected-note {{jump bypasses variable initialization}}
+        case 2: // expected-error {{cannot jump from switch statement to this case label}}
+            break;
+    }
+}