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

[Fangyi Zhou via cfe-commits]

https://github.com/fangyi-zhou created 
https://github.com/llvm/llvm-project/pull/139936

Reverts llvm/llvm-project#139820

Reverting due to buildbot failures in asan

>From 68c3a1d7fe840f9ed9f10764f0eda8eff93483c2 Mon Sep 17 00:00:00 2001
From: Fangyi Zhou <m...@fangyi.io>
Date: Wed, 14 May 2025 18:28:52 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"[clang][analyzer]=20Fix=20a=20nullptr?=
 =?UTF-8?q?=20dereference=20when=20`-ftime-trace`=20is=20us=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 440e510b896be2ef4a4f0730b8201378beee55b3.
---
 .../clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h  | 5 +----
 clang/test/Analysis/ftime-trace-no-init.cpp                  | 5 -----
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 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

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits