[PATCH] D101635: [analyzer] Fix assertion in SVals.h

[Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGa27af1d8166c: [analyzer] Fix assertion in SVals.h (authored 
by vabridgers, committed by einvbri <vince.a.bridg...@ericsson.com>).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D101635/new/

https://reviews.llvm.org/D101635

Files:
  clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
  clang/test/Analysis/casts.c


Index: clang/test/Analysis/casts.c
===================================================================
--- clang/test/Analysis/casts.c
+++ clang/test/Analysis/casts.c
@@ -250,3 +250,19 @@
   if (**a == 0) // no-crash
     ;
 }
+
+// See PR50179.
+// Just don't crash.
+typedef struct taskS {
+  void *pJob;
+} taskS;
+
+typedef struct workS {
+  taskS *pTaskList;
+} workS;
+
+void *getTaskJob(unsigned jobId, workS *pWork, unsigned taskId) {
+  const taskS *pTask = pWork->pTaskList + taskId;
+  taskS task = *pTask;
+  return task.pJob;
+}
Index: clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -761,8 +761,8 @@
       // Next fixes pointer dereference using type different from its initial
       // one. See PR37503 and PR49007 for details.
       if (const auto *ER = dyn_cast<ElementRegion>(R)) {
-        R = StateMgr.getStoreManager().castRegion(ER, CastTy);
-        return loc::MemRegionVal(R);
+        if ((R = StateMgr.getStoreManager().castRegion(ER, CastTy)))
+          return loc::MemRegionVal(R);
       }
 
       return V;



Index: clang/test/Analysis/casts.c
===================================================================
--- clang/test/Analysis/casts.c
+++ clang/test/Analysis/casts.c
@@ -250,3 +250,19 @@
   if (**a == 0) // no-crash
     ;
 }
+
+// See PR50179.
+// Just don't crash.
+typedef struct taskS {
+  void *pJob;
+} taskS;
+
+typedef struct workS {
+  taskS *pTaskList;
+} workS;
+
+void *getTaskJob(unsigned jobId, workS *pWork, unsigned taskId) {
+  const taskS *pTask = pWork->pTaskList + taskId;
+  taskS task = *pTask;
+  return task.pJob;
+}
Index: clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -761,8 +761,8 @@
       // Next fixes pointer dereference using type different from its initial
       // one. See PR37503 and PR49007 for details.
       if (const auto *ER = dyn_cast<ElementRegion>(R)) {
-        R = StateMgr.getStoreManager().castRegion(ER, CastTy);
-        return loc::MemRegionVal(R);
+        if ((R = StateMgr.getStoreManager().castRegion(ER, CastTy)))
+          return loc::MemRegionVal(R);
       }
 
       return V;

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