[clang-tools-extra] 9437613 - Revert "[clang-tidy] Fix crash in misc-static-initialization-cycle" (#198315)

[via cfe-commits]

Author: Zeyi Xu
Date: 2026-05-18T15:29:56Z
New Revision: 943761340a3689a60284797d1d2cf3325131d70e

URL: https://github.com/llvm/llvm-project/commit/943761340a3689a60284797d1d2cf3325131d70e
DIFF: https://github.com/llvm/llvm-project/commit/943761340a3689a60284797d1d2cf3325131d70e.diff

LOG: Revert "[clang-tidy] Fix crash in misc-static-initialization-cycle" (#198315)

The previous commit caused a buildbot failure:
https://lab.llvm.org/buildbot/#/builders/46/builds/35532

Added: 
    

Modified: 
    clang-tools-extra/clang-tidy/misc/StaticInitializationCycleCheck.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/static-initialization-cycle.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clang-tidy/misc/StaticInitializationCycleCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticInitializationCycleCheck.cpp
index 3d1fc88e7233a..eb230983c8a7a 100644
--- a/clang-tools-extra/clang-tidy/misc/StaticInitializationCycleCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/StaticInitializationCycleCheck.cpp
@@ -193,7 +193,7 @@ class VarUseCollector : public DynamicRecursiveASTVisitor {
   }
   bool TraverseAttr(Attr *At) override { return true; }
   bool TraverseDecl(Decl *D) override {
-    if (D && DC && DC->containsDecl(D))
+    if (DC && DC->containsDecl(D))
       return DynamicRecursiveASTVisitor::TraverseDecl(D);
     return true;
   }

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc/static-initialization-cycle.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/static-initialization-cycle.cpp
index c17a87758e243..2e5af81b6af8c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/static-initialization-cycle.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/static-initialization-cycle.cpp
@@ -120,14 +120,6 @@ int f1() {
 int S::A = f1();
 }
 
-namespace catch_all_handler {
-void f() {
-  try {
-  } catch (...) {
-  }
-}
-} // catch_all_handler
-
 namespace recursive_calls {
 int f2();
 int f1() {