public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-8670] analyzer: fix ICE on NULL change.m_expr [PR100244]
@ 2021-07-02 19:21 David Malcolm
0 siblings, 0 replies; only message in thread
From: David Malcolm @ 2021-07-02 19:21 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:1187f297f7ef6a3dc86103b642d463f7a7bd6096
commit r11-8670-g1187f297f7ef6a3dc86103b642d463f7a7bd6096
Author: David Malcolm <dmalcolm@redhat.com>
Date: Fri Jul 2 15:19:43 2021 -0400
analyzer: fix ICE on NULL change.m_expr [PR100244]
PR analyzer/100244 reports an ICE on a -Wanalyzer-free-of-non-heap
due to a case where free_of_non_heap::describe_state_change can be
passed a NULL change.m_expr for a suitably complicated symbolic value.
Bulletproof it by checking for change.m_expr being NULL before
dereferencing it.
gcc/analyzer/ChangeLog:
PR analyzer/100244
* sm-malloc.cc (free_of_non_heap::describe_state_change):
Bulletproof against change.m_expr being NULL.
gcc/testsuite/ChangeLog:
PR analyzer/100244
* g++.dg/analyzer/pr100244.C: New test.
Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diff:
---
gcc/analyzer/sm-malloc.cc | 2 +-
gcc/testsuite/g++.dg/analyzer/pr100244.C | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/gcc/analyzer/sm-malloc.cc b/gcc/analyzer/sm-malloc.cc
index 1d5b8601b1f..f02b73ab90a 100644
--- a/gcc/analyzer/sm-malloc.cc
+++ b/gcc/analyzer/sm-malloc.cc
@@ -1303,7 +1303,7 @@ public:
{
/* Attempt to reconstruct what kind of pointer it is.
(It seems neater for this to be a part of the state, though). */
- if (TREE_CODE (change.m_expr) == SSA_NAME)
+ if (change.m_expr && TREE_CODE (change.m_expr) == SSA_NAME)
{
gimple *def_stmt = SSA_NAME_DEF_STMT (change.m_expr);
if (gcall *call = dyn_cast <gcall *> (def_stmt))
diff --git a/gcc/testsuite/g++.dg/analyzer/pr100244.C b/gcc/testsuite/g++.dg/analyzer/pr100244.C
new file mode 100644
index 00000000000..261b3cfff57
--- /dev/null
+++ b/gcc/testsuite/g++.dg/analyzer/pr100244.C
@@ -0,0 +1,22 @@
+// { dg-additional-options "-O1 -Wno-free-nonheap-object" }
+
+inline void *operator new (__SIZE_TYPE__, void *__p) { return __p; }
+
+struct __aligned_buffer {
+ int _M_storage;
+ int *_M_addr() { return &_M_storage; }
+};
+
+struct _Hashtable_alloc {
+ int _M_single_bucket;
+ int *_M_buckets;
+ _Hashtable_alloc () { _M_buckets = &_M_single_bucket; }
+ ~_Hashtable_alloc () { delete _M_buckets; } // { dg-warning "not on the heap" }
+};
+
+void
+test01 (__aligned_buffer buf)
+{
+ _Hashtable_alloc *tmp = new (buf._M_addr ()) _Hashtable_alloc;
+ tmp->~_Hashtable_alloc ();
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-02 19:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 19:21 [gcc r11-8670] analyzer: fix ICE on NULL change.m_expr [PR100244] David Malcolm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).