From: "Martin Liška" <mliska@suse.cz>
To: gcc-patches@gcc.gnu.org
Cc: Marc Glisse <marc.glisse@inria.fr>
Subject: [PATCH] Check DECL_CONTEXT of new/delete operators.
Date: Mon, 30 Mar 2020 10:40:59 +0200 [thread overview]
Message-ID: <af29444d-118a-4818-26ca-bbe468a587dd@suse.cz> (raw)
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi.
The patch ensures that a deleted new/delete pair has a same context.
That will fix the issue presented in the PR.
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed?
Thanks,
Martin
gcc/ChangeLog:
2020-03-30 Martin Liska <mliska@suse.cz>
PR c++/94314
* tree-ssa-dce.c (propagate_necessity): Verify that
DECL_CONTEXT of a new/delete operators do match.
gcc/testsuite/ChangeLog:
2020-03-30 Martin Liska <mliska@suse.cz>
PR c++/94314
* g++.dg/pr94314.C: New test.
---
gcc/testsuite/g++.dg/pr94314.C | 84 ++++++++++++++++++++++++++++++++++
gcc/tree-ssa-dce.c | 31 +++++++++----
2 files changed, 105 insertions(+), 10 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/pr94314.C
[-- Attachment #2: 0001-Check-DECL_CONTEXT-of-new-delete-operators.patch --]
[-- Type: text/x-patch, Size: 3182 bytes --]
diff --git a/gcc/testsuite/g++.dg/pr94314.C b/gcc/testsuite/g++.dg/pr94314.C
new file mode 100644
index 00000000000..76cd9d8d2a4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314.C
@@ -0,0 +1,84 @@
+/* PR c++/94314. */
+/* { dg-options "-O2 -fdump-tree-cddce-details" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+struct A
+{
+ __attribute__((malloc,noinline))
+ static void* operator new(unsigned long sz)
+ {
+ ++count;
+ return ::operator new(sz);
+ }
+
+ static void operator delete(void* ptr)
+ {
+ --count;
+ ::operator delete(ptr);
+ }
+
+ static int count;
+};
+
+int A::count = 0;
+
+struct B
+{
+ __attribute__((malloc,noinline))
+ static void* operator new(unsigned long sz)
+ {
+ ++count;
+ return ::operator new(sz);
+ }
+
+ __attribute__((noinline))
+ static void operator delete(void* ptr)
+ {
+ --count;
+ ::operator delete(ptr);
+ }
+
+ static int count;
+};
+
+int B::count = 0;
+
+struct C
+{
+ static void* operator new(unsigned long sz)
+ {
+ ++count;
+ return ::operator new(sz);
+ }
+
+ static void operator delete(void* ptr)
+ {
+ --count;
+ ::operator delete(ptr);
+ }
+
+ static int count;
+};
+
+int C::count = 0;
+
+int main(){
+ delete new A;
+ if (A::count != 0)
+ __builtin_abort ();
+
+ delete new B;
+ if (B::count != 0)
+ __builtin_abort ();
+
+ delete new C;
+ if (C::count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-times "Deleting : operator delete" 1 "cddce1"} } */
+/* { dg-final { scan-tree-dump-times "Deleting : B::operator delete" 1 "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index e4077b58890..d86234ead23 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -824,16 +824,27 @@ propagate_necessity (bool aggressive)
|| DECL_FUNCTION_CODE (def_callee) == BUILT_IN_CALLOC))
|| DECL_IS_REPLACEABLE_OPERATOR_NEW_P (def_callee)))
{
- /* Delete operators can have alignment and (or) size as next
- arguments. When being a SSA_NAME, they must be marked
- as necessary. */
- if (is_delete_operator && gimple_call_num_args (stmt) >= 2)
- for (unsigned i = 1; i < gimple_call_num_args (stmt); i++)
- {
- tree arg = gimple_call_arg (stmt, i);
- if (TREE_CODE (arg) == SSA_NAME)
- mark_operand_necessary (arg);
- }
+ if (is_delete_operator)
+ {
+ /* Verify that new and delete operators have the same
+ context. */
+ if (DECL_IS_REPLACEABLE_OPERATOR_NEW_P (def_callee)
+ && (DECL_CONTEXT (def_callee)
+ != DECL_CONTEXT (gimple_call_fndecl (stmt))))
+ mark_operand_necessary (gimple_call_arg (stmt, 0));
+
+ /* Delete operators can have alignment and (or) size
+ as next arguments. When being a SSA_NAME, they
+ must be marked as necessary. */
+ if (gimple_call_num_args (stmt) >= 2)
+ for (unsigned i = 1; i < gimple_call_num_args (stmt);
+ i++)
+ {
+ tree arg = gimple_call_arg (stmt, i);
+ if (TREE_CODE (arg) == SSA_NAME)
+ mark_operand_necessary (arg);
+ }
+ }
continue;
}
next reply other threads:[~2020-03-30 8:41 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 8:40 Martin Liška [this message]
2020-03-30 8:53 ` Richard Biener
2020-03-31 12:29 ` Jan Hubicka
2020-03-31 12:38 ` Martin Liška
2020-04-03 15:26 ` Jan Hubicka
2020-04-03 15:42 ` Jan Hubicka
2020-04-04 11:53 ` Jan Hubicka
2020-04-06 9:27 ` Richard Biener
2020-04-06 15:10 ` Jason Merrill
2020-04-06 8:34 ` Martin Liška
2020-04-06 12:45 ` Nathan Sidwell
2020-04-07 8:26 ` Jonathan Wakely
2020-04-07 9:29 ` Richard Biener
2020-04-07 9:49 ` Jan Hubicka
2020-04-07 10:22 ` Richard Biener
2020-04-07 10:42 ` Martin Liška
2020-04-07 11:41 ` Jonathan Wakely
2020-04-07 10:46 ` Martin Liška
2020-04-07 11:29 ` Jonathan Wakely
2020-04-07 11:40 ` Richard Biener
2020-04-07 11:46 ` Jonathan Wakely
2020-04-07 11:57 ` Richard Biener
2020-04-07 15:00 ` [PATCH] Allow new/delete operator deletion only for replaceable Martin Liška
2020-04-08 8:47 ` Richard Biener
2020-04-08 13:20 ` Jason Merrill
2020-04-08 13:32 ` Jakub Jelinek
2020-04-08 13:34 ` Jason Merrill
2020-04-08 15:16 ` Martin Liška
2020-04-08 15:46 ` Jan Hubicka
2020-04-08 16:06 ` Jakub Jelinek
2020-04-09 5:05 ` Martin Liška
2020-04-09 6:45 ` Richard Biener
2020-04-09 6:59 ` Martin Liška
2020-04-09 7:21 ` Richard Biener
2020-04-09 7:55 ` Jakub Jelinek
2020-04-09 8:04 ` Marc Glisse
2020-04-09 8:13 ` Jonathan Wakely
2020-04-10 8:08 ` Martin Liška
2020-04-10 8:18 ` Jonathan Wakely
2020-04-10 8:29 ` Martin Liška
2020-04-10 9:17 ` Jakub Jelinek
2020-04-14 7:09 ` Martin Liška
2020-04-14 7:11 ` Martin Liška
2020-04-14 8:37 ` Jakub Jelinek
2020-04-14 10:54 ` Martin Liška
2020-04-17 7:05 ` Jakub Jelinek
2020-04-17 8:12 ` Jonathan Wakely
2020-04-10 8:37 ` Marc Glisse
2020-04-10 9:11 ` Iain Sandoe
2020-04-09 16:55 ` Jason Merrill
2020-04-07 15:16 ` [PATCH] Check DECL_CONTEXT of new/delete operators Jonathan Wakely
2020-04-08 7:34 ` Richard Biener
2020-04-08 8:11 ` Jonathan Wakely
2020-04-07 14:11 ` Nathan Sidwell
2020-03-30 9:29 ` Marc Glisse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=af29444d-118a-4818-26ca-bbe468a587dd@suse.cz \
--to=mliska@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
--cc=marc.glisse@inria.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).