[clang] [NFC] In GetDiagForGotoScopeDecl(), limit Init to inside the if condition (#116080)

bricknerb · web-flow · commit 560dd940f573 · 2024-11-20T08:59:43.000+01:00
diff --git a/clang/lib/Sema/JumpDiagnostics.cpp b/clang/lib/Sema/JumpDiagnostics.cpp
@@ -179,9 +179,9 @@ static ScopePair GetDiagForGotoScopeDecl(Sema &S, const Decl *D) {
       }
     }
 
-    const Expr *Init = VD->getInit();
-    if (S.Context.getLangOpts().CPlusPlus && VD->hasLocalStorage() && Init &&
-        !Init->containsErrors()) {
+    if (const Expr *Init = VD->getInit(); S.Context.getLangOpts().CPlusPlus &&
+                                          VD->hasLocalStorage() && Init &&
+                                          !Init->containsErrors()) {
       // C++11 [stmt.dcl]p3:
       //   A program that jumps from a point where a variable with automatic
       //   storage duration is not in scope to a point where it is in scope

Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,9 @@ static ScopePair GetDiagForGotoScopeDecl(Sema &S, const Decl *D) {`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`- const Expr *Init = VD->getInit();`
`183`		`- if (S.Context.getLangOpts().CPlusPlus && VD->hasLocalStorage() && Init &&`
`184`		`- !Init->containsErrors()) {`
	`182`	`+ if (const Expr *Init = VD->getInit(); S.Context.getLangOpts().CPlusPlus &&`
	`183`	`+ VD->hasLocalStorage() && Init &&`
	`184`	`+ !Init->containsErrors()) {`
`185`	`185`	`// C++11 [stmt.dcl]p3:`
`186`	`186`	`// A program that jumps from a point where a variable with automatic`
`187`	`187`	`// storage duration is not in scope to a point where it is in scope`