[clang] baf2cfa - Revert "[clang][analyzer] Fix a nullptr dereference when `-ftime-trace` is used" (#139936)

[via cfe-commits]

Author: Fangyi Zhou
Date: 2025-05-14T13:45:05-04:00
New Revision: baf2cfa299ea62f3bdb717c8f464f824257527ff

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

LOG: Revert "[clang][analyzer] Fix a nullptr dereference when `-ftime-trace` is used" (#139936)

Reverts llvm/llvm-project#139820

Reverting due to buildbot failures in asan

Added: 
    

Modified: 
    clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h

Removed: 
    clang/test/Analysis/ftime-trace-no-init.cpp


################################################################################
diff  --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
index 2e06e71f7be5f..9e7c98fdded17 100644
--- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
@@ -103,10 +103,7 @@ class SymbolConjured : public SymbolData {
   const Stmt *getStmt() const {
     switch (Elem->getKind()) {
     case CFGElement::Initializer:
-      if (const auto *Init = Elem->castAs<CFGInitializer>().getInitializer()) {
-        return Init->getInit();
-      }
-      return nullptr;
+      return Elem->castAs<CFGInitializer>().getInitializer()->getInit();
     case CFGElement::ScopeBegin:
       return Elem->castAs<CFGScopeBegin>().getTriggerStmt();
     case CFGElement::ScopeEnd:

diff  --git a/clang/test/Analysis/ftime-trace-no-init.cpp b/clang/test/Analysis/ftime-trace-no-init.cpp
deleted file mode 100644
index 7fb289b19da78..0000000000000
--- a/clang/test/Analysis/ftime-trace-no-init.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %clang_analyze_cc1 -analyzer-checker=core,apiModeling %s -ftime-trace=%t.raw.json -verify
-// expected-no-diagnostics
-
-// GitHub issue 139779
-struct {} a; // no-crash