From e3ece7684b02c47d2b259899cf8009d6bdcccaf3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 31 Aug 2023 13:53:21 +0200 Subject: [PATCH] middle-end/111253 - partly revert r11-6508-gabb1b6058c09a7 The following keeps dumping SSA def stmt RHS during diagnostic reporting only for gimple_assign_single_p defs which means memory loads. This avoids diagnostics containing PHI nodes like warning: 'realloc' called on pointer '*_42 = PHI .t_mem_caches' with nonzero offset 40 instead getting back the previous behavior: warning: 'realloc' called on pointer '*.t_mem_caches' with nonzero offset 40 PR middle-end/111253 gcc/c-family/ * c-pretty-print.cc (c_pretty_printer::primary_expression): Only dump gimple_assign_single_p SSA def RHS. gcc/testsuite/ * gcc.dg/Wfree-nonheap-object-7.c: New testcase. --- gcc/c-family/c-pretty-print.cc | 7 ++++- gcc/testsuite/gcc.dg/Wfree-nonheap-object-7.c | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/Wfree-nonheap-object-7.c diff --git a/gcc/c-family/c-pretty-print.cc b/gcc/c-family/c-pretty-print.cc index 7536a7c471ff..679aa766fe00 100644 --- a/gcc/c-family/c-pretty-print.cc +++ b/gcc/c-family/c-pretty-print.cc @@ -33,6 +33,9 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "options.h" #include "internal-fn.h" +#include "function.h" +#include "basic-block.h" +#include "gimple.h" /* The pretty-printer code is primarily designed to closely follow (GNU) C and C++ grammars. That is to be contrasted with spaghetti @@ -1380,12 +1383,14 @@ c_pretty_printer::primary_expression (tree e) else primary_expression (var); } - else + else if (gimple_assign_single_p (SSA_NAME_DEF_STMT (e))) { /* Print only the right side of the GIMPLE assignment. */ gimple *def_stmt = SSA_NAME_DEF_STMT (e); pp_gimple_stmt_1 (this, def_stmt, 0, TDF_RHS_ONLY); } + else + expression (e); break; default: diff --git a/gcc/testsuite/gcc.dg/Wfree-nonheap-object-7.c b/gcc/testsuite/gcc.dg/Wfree-nonheap-object-7.c new file mode 100644 index 000000000000..6116bfa4d8ea --- /dev/null +++ b/gcc/testsuite/gcc.dg/Wfree-nonheap-object-7.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wfree-nonheap-object" } */ + +struct local_caches *get_local_caches_lcs; +void *calloc(long, long); +void *realloc(); + +struct local_caches { + int *t_mem_caches; +}; + +struct local_caches *get_local_caches() { + if (get_local_caches_lcs) + return get_local_caches_lcs; + get_local_caches_lcs = calloc(1, 0); + return get_local_caches_lcs; +} + +void libtrace_ocache_free() { + struct local_caches lcs = *get_local_caches(), __trans_tmp_1 = lcs; + { + struct local_caches *lcs = &__trans_tmp_1; + lcs->t_mem_caches += 10; + __trans_tmp_1.t_mem_caches = realloc(__trans_tmp_1.t_mem_caches, sizeof(int)); // { dg-warning "called on pointer (?:(?!PHI).)*nonzero offset" } + } +} -- 2.47.2