public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-14 7:11 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-14 7:11 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:fb093e29d013ce0ce8e9181bd10635d14a48bcd2
commit fb093e29d013ce0ce8e9181bd10635d14a48bcd2
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 ++++++++++++++
gcc/tree-ssa-dce.c | 98 ++++++++++++++++++++++++++++++++++++----
3 files changed, 123 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..757cfad5b5e 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,77 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ tree new_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call));
+ tree delete_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call));
+ const char *new_name = IDENTIFIER_POINTER (new_asm);
+ const char *delete_name = IDENTIFIER_POINTER (delete_asm);
+ unsigned int new_len = IDENTIFIER_LENGTH (new_asm);
+ unsigned int delete_len = IDENTIFIER_LENGTH (delete_asm);
+
+ if (new_len < 5 || delete_len < 6)
+ return false;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (new_len < 4 || delete_len < 5)
+ return false;
+ /* *_len is now just the length after initial underscores. */
+ if (new_name[0] != 'Z' || new_name[1] != 'n')
+ return false;
+ if (delete_name[0] != 'Z' || delete_name[1] != 'd')
+ return false;
+ /* _Znw must match _Zdl, _Zna must match _Zda. */
+ if ((new_name[2] != 'w' || delete_name[2] != 'l')
+ && (new_name[2] != 'a' || delete_name[2] != 'a'))
+ return false;
+ /* 'j', 'm' and 'y' correspond to size_t. */
+ if (new_name[3] != 'j' && new_name[3] != 'm' && new_name[3] != 'y')
+ return false;
+ if (delete_name[3] != 'P' || delete_name[4] != 'v')
+ return false;
+ if (new_len == 4
+ || (new_len == 18 && !memcmp (new_name + 4, "RKSt9nothrow_t", 14)))
+ {
+ /* _ZnXY or _ZnXYRKSt9nothrow_t matches
+ _ZdXPv, _ZdXPvY and _ZdXPvRKSt9nothrow_t. */
+ if (delete_len == 5)
+ return true;
+ if (delete_len == 6 && delete_name[5] == new_name[3])
+ return true;
+ if (delete_len == 19 && !memcmp (delete_name + 5, "RKSt9nothrow_t", 14))
+ return true;
+ }
+ else if ((new_len == 19 && !memcmp (new_name + 4, "St11align_val_t", 15))
+ || (new_len == 33
+ && !memcmp (new_name + 4, "St11align_val_tRKSt9nothrow_t", 29)))
+ {
+ /* _ZnXYSt11align_val_t or _ZnXYSt11align_val_tRKSt9nothrow_t matches
+ _ZdXPvSt11align_val_t or _ZdXPvYSt11align_val_t or or
+ _ZdXPvSt11align_val_tRKSt9nothrow_t. */
+ if (delete_len == 20 && !memcmp (delete_name + 5, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 21
+ && delete_name[5] == new_name[3]
+ && !memcmp (delete_name + 6, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 34
+ && !memcmp (delete_name + 5, "St11align_val_tRKSt9nothrow_t", 29))
+ return true;
+ }
+ return false;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +895,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-14 10:53 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-14 10:53 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:29626be765eea010f7d1505d08d594844e4518bf
commit 29626be765eea010f7d1505d08d594844e4518bf
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* g++.dg/pr94314.C: Do not use dg-additional-options
and remove not needed stdio.h include.
* g++.dg/pr94314-2.C: Likewise.
* g++.dg/pr94314-3.C: Likewise.
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-2.C | 5 +-
gcc/testsuite/g++.dg/pr94314-3.C | 5 +-
gcc/testsuite/g++.dg/pr94314-4.C | 30 ++++++++++++
gcc/testsuite/g++.dg/pr94314.C | 5 +-
gcc/tree-ssa-dce.c | 98 ++++++++++++++++++++++++++++++++++++----
6 files changed, 123 insertions(+), 22 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-2.C b/gcc/testsuite/g++.dg/pr94314-2.C
index 36b93ed6d4d..998ce601767 100644
--- a/gcc/testsuite/g++.dg/pr94314-2.C
+++ b/gcc/testsuite/g++.dg/pr94314-2.C
@@ -1,9 +1,6 @@
/* PR c++/94314. */
/* { dg-do run } */
-/* { dg-options "-O2 -fdump-tree-cddce-details" } */
-/* { dg-additional-options "-fdelete-null-pointer-checks" } */
-
-#include <stdio.h>
+/* { dg-options "-O2 -fdump-tree-cddce-details -fdelete-null-pointer-checks" } */
struct A
{
diff --git a/gcc/testsuite/g++.dg/pr94314-3.C b/gcc/testsuite/g++.dg/pr94314-3.C
index 575ba9d8ad8..846a5d6a3d8 100644
--- a/gcc/testsuite/g++.dg/pr94314-3.C
+++ b/gcc/testsuite/g++.dg/pr94314-3.C
@@ -1,9 +1,6 @@
/* PR c++/94314. */
/* { dg-do run } */
-/* { dg-options "-O2 --param early-inlining-insns=100 -fdump-tree-cddce-details" } */
-/* { dg-additional-options "-fdelete-null-pointer-checks" } */
-
-#include <stdio.h>
+/* { dg-options "-O2 --param early-inlining-insns=100 -fdump-tree-cddce-details -fdelete-null-pointer-checks" } */
volatile int idx;
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..d097f29d4ad
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,30 @@
+/* PR c++/94314. */
+/* { dg-do run { target c++11 } } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -fdelete-null-pointer-checks" } */
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/testsuite/g++.dg/pr94314.C b/gcc/testsuite/g++.dg/pr94314.C
index 86e651d10ba..4e5ae122e9f 100644
--- a/gcc/testsuite/g++.dg/pr94314.C
+++ b/gcc/testsuite/g++.dg/pr94314.C
@@ -1,9 +1,6 @@
/* PR c++/94314. */
/* { dg-do run } */
-/* { dg-options "-O2 -fdump-tree-cddce-details" } */
-/* { dg-additional-options "-fdelete-null-pointer-checks" } */
-
-#include <stdio.h>
+/* { dg-options "-O2 -fdump-tree-cddce-details -fdelete-null-pointer-checks" } */
struct A
{
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..757cfad5b5e 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,77 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ tree new_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call));
+ tree delete_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call));
+ const char *new_name = IDENTIFIER_POINTER (new_asm);
+ const char *delete_name = IDENTIFIER_POINTER (delete_asm);
+ unsigned int new_len = IDENTIFIER_LENGTH (new_asm);
+ unsigned int delete_len = IDENTIFIER_LENGTH (delete_asm);
+
+ if (new_len < 5 || delete_len < 6)
+ return false;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (new_len < 4 || delete_len < 5)
+ return false;
+ /* *_len is now just the length after initial underscores. */
+ if (new_name[0] != 'Z' || new_name[1] != 'n')
+ return false;
+ if (delete_name[0] != 'Z' || delete_name[1] != 'd')
+ return false;
+ /* _Znw must match _Zdl, _Zna must match _Zda. */
+ if ((new_name[2] != 'w' || delete_name[2] != 'l')
+ && (new_name[2] != 'a' || delete_name[2] != 'a'))
+ return false;
+ /* 'j', 'm' and 'y' correspond to size_t. */
+ if (new_name[3] != 'j' && new_name[3] != 'm' && new_name[3] != 'y')
+ return false;
+ if (delete_name[3] != 'P' || delete_name[4] != 'v')
+ return false;
+ if (new_len == 4
+ || (new_len == 18 && !memcmp (new_name + 4, "RKSt9nothrow_t", 14)))
+ {
+ /* _ZnXY or _ZnXYRKSt9nothrow_t matches
+ _ZdXPv, _ZdXPvY and _ZdXPvRKSt9nothrow_t. */
+ if (delete_len == 5)
+ return true;
+ if (delete_len == 6 && delete_name[5] == new_name[3])
+ return true;
+ if (delete_len == 19 && !memcmp (delete_name + 5, "RKSt9nothrow_t", 14))
+ return true;
+ }
+ else if ((new_len == 19 && !memcmp (new_name + 4, "St11align_val_t", 15))
+ || (new_len == 33
+ && !memcmp (new_name + 4, "St11align_val_tRKSt9nothrow_t", 29)))
+ {
+ /* _ZnXYSt11align_val_t or _ZnXYSt11align_val_tRKSt9nothrow_t matches
+ _ZdXPvSt11align_val_t or _ZdXPvYSt11align_val_t or or
+ _ZdXPvSt11align_val_tRKSt9nothrow_t. */
+ if (delete_len == 20 && !memcmp (delete_name + 5, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 21
+ && delete_name[5] == new_name[3]
+ && !memcmp (delete_name + 6, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 34
+ && !memcmp (delete_name + 5, "St11align_val_tRKSt9nothrow_t", 29))
+ return true;
+ }
+ return false;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +895,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-14 6:40 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-14 6:40 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:60626d4b040bc502c563b7c014b62751a517705a
commit 60626d4b040bc502c563b7c014b62751a517705a
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
(perform_tree_ssa_dce): Delete valid_pairs.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
Jakub Jelinek <jakub@redhat.com>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 +++++++++++++
gcc/tree-ssa-dce.c | 103 +++++++++++++++++++++++++++++++++++----
3 files changed, 128 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..69566cd50e2 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,80 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Valid pairs of new and delete operators for DCE. */
+static hash_set<nofree_string_hash> *valid_pairs = NULL;
+
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ tree new_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call));
+ tree delete_asm = DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call));
+ const char *new_name = IDENTIFIER_POINTER (new_asm);
+ const char *delete_name = IDENTIFIER_POINTER (delete_asm);
+ unsigned int new_len = IDENTIFIER_LENGTH (new_asm);
+ unsigned int delete_len = IDENTIFIER_LENGTH (delete_asm);
+
+ if (new_len < 5 || delete_len < 6)
+ return false;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (new_name[0] == '_')
+ ++new_name, --new_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (delete_name[0] == '_')
+ ++delete_name, --delete_len;
+ if (new_len < 4 || delete_len < 5)
+ return false;
+ /* *_len is now just the length after initial underscores. */
+ if (new_name[0] != 'Z' || new_name[1] != 'n')
+ return false;
+ if (delete_name[0] != 'Z' || delete_name[1] != 'd')
+ return false;
+ /* _Znw must match _Zdl, _Zna must match _Zda. */
+ if ((new_name[2] != 'w' || delete_name[2] != 'l')
+ && (new_name[2] != 'a' || delete_name[2] != 'a'))
+ return false;
+ /* 'j', 'm' and 'y' correspond to size_t. */
+ if (new_name[3] != 'j' && new_name[3] != 'm' && new_name[3] != 'y')
+ return false;
+ if (delete_name[3] != 'P' || delete_name[4] != 'v')
+ return false;
+ if (new_len == 4
+ || (new_len == 18 && !memcmp (new_name + 4, "RKSt9nothrow_t", 14)))
+ {
+ /* _ZnXY or _ZnXYRKSt9nothrow_t matches
+ _ZdXPv, _ZdXPvY and _ZdXPvRKSt9nothrow_t. */
+ if (delete_len == 5)
+ return true;
+ if (delete_len == 6 && delete_name[5] == new_name[3])
+ return true;
+ if (delete_len == 19 && !memcmp (delete_name + 5, "RKSt9nothrow_t", 14))
+ return true;
+ }
+ else if ((new_len == 19 && !memcmp (new_name + 4, "St11align_val_t", 15))
+ || (new_len == 33
+ && !memcmp (new_name + 4, "St11align_val_tRKSt9nothrow_t", 29)))
+ {
+ /* _ZnXYSt11align_val_t or _ZnXYSt11align_val_tRKSt9nothrow_t matches
+ _ZdXPvSt11align_val_t or _ZdXPvYSt11align_val_t or or
+ _ZdXPvSt11align_val_tRKSt9nothrow_t. */
+ if (delete_len == 20 && !memcmp (delete_name + 5, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 21
+ && delete_name[5] == new_name[3]
+ && !memcmp (delete_name + 6, "St11align_val_t", 15))
+ return true;
+ if (delete_len == 34
+ && !memcmp (delete_name + 5, "St11align_val_tRKSt9nothrow_t", 29))
+ return true;
+ }
+ return false;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +898,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
@@ -1662,6 +1743,8 @@ perform_tree_ssa_dce (bool aggressive)
visited = BITMAP_ALLOC (NULL);
propagate_necessity (aggressive);
BITMAP_FREE (visited);
+ delete valid_pairs;
+ valid_pairs = NULL;
something_changed |= eliminate_unnecessary_stmts ();
something_changed |= cfg_altered;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-10 8:27 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-10 8:27 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:4043b187ee8e6d7d0c05a6463e38ca54ba4acf75
commit 4043b187ee8e6d7d0c05a6463e38ca54ba4acf75
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
(perform_tree_ssa_dce): Delete valid_pairs.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 ++++++++++++++
gcc/tree-ssa-dce.c | 99 ++++++++++++++++++++++++++++++++++++----
3 files changed, 124 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..f66069e410d 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,76 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Valid pairs of new and delete operators for DCE. */
+static hash_set<nofree_string_hash> *valid_pairs = NULL;
+
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ const char *new_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call)));
+ const char *delete_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call)));
+
+ if (new_name[0] == '_' and new_name[1] == '_')
+ ++new_name;
+ if (delete_name[0] == '_' and delete_name[1] == '_')
+ ++delete_name;
+
+ char *needle = concat (new_name, ":", delete_name, NULL);
+
+ if (valid_pairs == NULL)
+ {
+ valid_pairs = new hash_set<nofree_string_hash> ();
+ /* Invalid pairs:
+ non-[] and []
+ aligned and non-aligned
+ */
+
+ const char *pairs[] = {
+ /* non-[] operators. */
+ "_Znwm:_ZdlPv" ,
+ "_Znwm:_ZdlPvm" ,
+ "_Znwm:_ZdlPvRKSt9nothrow_t" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPv" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvm" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvRKSt9nothrow_t" ,
+ /* non-[] operators with alignment. */
+ "_ZnwmSt11align_val_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ /* [] operators. */
+ "_Znam:_ZdaPv" ,
+ "_Znam:_ZdaPvm" ,
+ "_Znam:_ZdaPvRKSt9nothrow_t" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPv" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvm" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvRKSt9nothrow_t" ,
+ /* [] operators with alignment. */
+ "_ZnamSt11align_val_t:_ZdaPvmSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvmSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_tRKSt9nothrow_t",
+ NULL
+ };
+
+ for (unsigned i = 0; pairs[i] != NULL; i++)
+ valid_pairs->add (pairs[i]);
+ }
+
+ bool r = valid_pairs->contains (needle);
+ free (needle);
+ return r;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +894,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
@@ -1662,6 +1739,8 @@ perform_tree_ssa_dce (bool aggressive)
visited = BITMAP_ALLOC (NULL);
propagate_necessity (aggressive);
BITMAP_FREE (visited);
+ delete valid_pairs;
+ valid_pairs = NULL;
something_changed |= eliminate_unnecessary_stmts ();
something_changed |= cfg_altered;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-10 8:04 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-10 8:04 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:aa7102bcd698b6f132e0b9ffecd847d68083039b
commit aa7102bcd698b6f132e0b9ffecd847d68083039b
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
(perform_tree_ssa_dce): Delete valid_pairs.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 ++++++++++++++
gcc/tree-ssa-dce.c | 93 +++++++++++++++++++++++++++++++++++-----
3 files changed, 118 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..e1074a803f8 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,70 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Valid pairs of new and delete operators for DCE. */
+static hash_set<nofree_string_hash> *valid_pairs = NULL;
+
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ const char *new_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call)));
+ const char *delete_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call)));
+ char *needle = concat (new_name, ":", delete_name, NULL);
+
+ if (valid_pairs == NULL)
+ {
+ valid_pairs = new hash_set<nofree_string_hash> ();
+ /* Invalid pairs:
+ non-[] and []
+ aligned and non-aligned
+ */
+
+ const char *pairs[] = {
+ /* non-[] operators. */
+ "_Znwm:_ZdlPv" ,
+ "_Znwm:_ZdlPvm" ,
+ "_Znwm:_ZdlPvRKSt9nothrow_t" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPv" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvm" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvRKSt9nothrow_t" ,
+ /* non-[] operators with alignment. */
+ "_ZnwmSt11align_val_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ /* [] operators. */
+ "_Znam:_ZdaPv" ,
+ "_Znam:_ZdaPvm" ,
+ "_Znam:_ZdaPvRKSt9nothrow_t" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPv" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvm" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvRKSt9nothrow_t" ,
+ /* [] operators with alignment. */
+ "_ZnamSt11align_val_t:_ZdaPvmSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvmSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_tRKSt9nothrow_t",
+ NULL
+ };
+
+ for (unsigned i = 0; pairs[i] != NULL; i++)
+ valid_pairs->add (pairs[i]);
+ }
+
+ bool r = valid_pairs->contains (needle);
+ free (needle);
+ return r;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +888,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
@@ -1662,6 +1733,8 @@ perform_tree_ssa_dce (bool aggressive)
visited = BITMAP_ALLOC (NULL);
propagate_necessity (aggressive);
BITMAP_FREE (visited);
+ delete valid_pairs;
+ valid_pairs = NULL;
something_changed |= eliminate_unnecessary_stmts ();
something_changed |= cfg_altered;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-09 14:12 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-09 14:12 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ca3150161a2aaf59c8349a0054b979e2cf03d4ee
commit ca3150161a2aaf59c8349a0054b979e2cf03d4ee
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 +++++++++++++++
gcc/tree-ssa-dce.c | 89 +++++++++++++++++++++++++++++++++++-----
3 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..b4efe978645 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,68 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ const char *new_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call)));
+ const char *delete_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call)));
+ char *needle = concat (new_name, ":", delete_name, NULL);
+
+ static hash_set<nofree_string_hash> *valid_pairs = NULL;
+ if (valid_pairs == NULL)
+ {
+ valid_pairs = new hash_set<nofree_string_hash> ();
+ /* Invalid pairs:
+ non-[] and []
+ aligned and non-aligned
+ */
+
+ const char *pairs[] = {
+ /* non-[] operators. */
+ "_Znwm:_ZdlPv" ,
+ "_Znwm:_ZdlPvm" ,
+ "_Znwm:_ZdlPvRKSt9nothrow_t" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPv" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvm" ,
+ "_ZnwmRKSt9nothrow_t:_ZdlPvRKSt9nothrow_t" ,
+ /* non-[] operators with alignment. */
+ "_ZnwmSt11align_val_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvmSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_t" ,
+ "_ZnwmSt11align_val_tRKSt9nothrow_t:_ZdlPvSt11align_val_tRKSt9nothrow_t" ,
+ /* [] operators. */
+ "_Znam:_ZdaPv" ,
+ "_Znam:_ZdaPvm" ,
+ "_Znam:_ZdaPvRKSt9nothrow_t" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPv" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvm" ,
+ "_ZnamRKSt9nothrow_t:_ZdaPvRKSt9nothrow_t" ,
+ /* [] operators with alignment. */
+ "_ZnamSt11align_val_t:_ZdaPvmSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_t" ,
+ "_ZnamSt11align_val_t:_ZdaPvSt11align_val_tRKSt9nothrow_t" ,
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvmSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_t",
+ "_ZnamSt11align_val_tRKSt9nothrow_t:_ZdaPvSt11align_val_tRKSt9nothrow_t",
+ NULL
+ };
+
+ for (unsigned i = 0; pairs[i] != NULL; i++)
+ valid_pairs->add (pairs[i]);
+ }
+
+ bool r = valid_pairs->contains (needle);
+ free (needle);
+ return r;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +886,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators.
@ 2020-04-09 13:53 Martin Liska
0 siblings, 0 replies; 7+ messages in thread
From: Martin Liska @ 2020-04-09 13:53 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:dc1f52d856c7d4fcda4a632963158dce2af24b43
commit dc1f52d856c7d4fcda4a632963158dce2af24b43
Author: Martin Liska <mliska@suse.cz>
Date: Thu Apr 9 15:50:58 2020 +0200
List valid pairs for new and delete operators.
gcc/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* cgraphclones.c (set_new_clone_decl_and_node_flags): Drop
DECL_IS_REPLACEABLE_OPERATOR during cloning.
* tree-ssa-dce.c (valid_new_delete_pair_p): New function.
(propagate_necessity): Check operator names.
gcc/testsuite/ChangeLog:
2020-04-09 Martin Liska <mliska@suse.cz>
PR c++/94314
* g++.dg/pr94314-4.C: New test.
Diff:
---
gcc/cgraphclones.c | 2 +
gcc/testsuite/g++.dg/pr94314-4.C | 33 ++++++++++++++++
gcc/tree-ssa-dce.c | 83 +++++++++++++++++++++++++++++++++++-----
3 files changed, 108 insertions(+), 10 deletions(-)
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index c73b8f810f0..8f541a28b6e 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -165,6 +165,7 @@ set_new_clone_decl_and_node_flags (cgraph_node *new_node)
DECL_STATIC_DESTRUCTOR (new_node->decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_node->decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_node->decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_node->decl) = 0;
new_node->externally_visible = 0;
new_node->local = 1;
@@ -1030,6 +1031,7 @@ cgraph_node::create_version_clone_with_body
DECL_STATIC_DESTRUCTOR (new_decl) = 0;
DECL_SET_IS_OPERATOR_NEW (new_decl, 0);
DECL_SET_IS_OPERATOR_DELETE (new_decl, 0);
+ DECL_IS_REPLACEABLE_OPERATOR (new_decl) = 0;
/* Create the new version's call-graph node.
and update the edges of the new node. */
diff --git a/gcc/testsuite/g++.dg/pr94314-4.C b/gcc/testsuite/g++.dg/pr94314-4.C
new file mode 100644
index 00000000000..afa2a443dc4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr94314-4.C
@@ -0,0 +1,33 @@
+/* PR c++/94314. */
+/* { dg-do run } */
+/* { dg-options "-O2 -fdump-tree-cddce-details -std=c++14" } */
+/* { dg-additional-options "-fdelete-null-pointer-checks" } */
+
+#include <stdio.h>
+
+int count = 0;
+
+__attribute__((malloc, noinline)) void* operator new[](__SIZE_TYPE__ sz) {
+ ++count;
+ return ::operator new(sz);
+}
+
+void operator delete[](void* ptr) noexcept {
+ --count;
+ ::operator delete(ptr);
+}
+
+void operator delete[](void* ptr, __SIZE_TYPE__ sz) noexcept {
+ --count;
+ ::operator delete(ptr, sz);
+}
+
+int main() {
+ delete[] new int[1];
+ if (count != 0)
+ __builtin_abort ();
+
+ return 0;
+}
+
+/* { dg-final { scan-tree-dump-not "Deleting : operator delete" "cddce1"} } */
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index fd5f24c746c..ef8c32b9f99 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -646,6 +646,62 @@ degenerate_phi_p (gimple *phi)
return true;
}
+/* Return that NEW_CALL and DELETE_CALL are a valid pair of new
+ and delete operators. */
+
+static bool
+valid_new_delete_pair_p (gimple *new_call, gimple *delete_call)
+{
+ const char *new_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (new_call)));
+ const char *delete_name
+ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (gimple_call_fndecl (delete_call)));
+
+ /* Invalid pairs:
+ non-[] and []
+ aligned and non-aligned
+ */
+
+ const char *valid_pairs[][2] = {
+ /* non-[] operators. */
+ {"_Znwm", "_ZdlPv" },
+ {"_Znwm", "_ZdlPvm" },
+ {"_Znwm", "_ZdlPvRKSt9nothrow_t" },
+ {"_ZnwmRKSt9nothrow_t", "_ZdlPv" },
+ {"_ZnwmRKSt9nothrow_t", "_ZdlPvm" },
+ {"_ZnwmRKSt9nothrow_t", "_ZdlPvRKSt9nothrow_t" },
+ /* non-[] operators with alignment. */
+ {"_ZnwmSt11align_val_t", "_ZdlPvmSt11align_val_t" },
+ {"_ZnwmSt11align_val_t", "_ZdlPvSt11align_val_t" },
+ {"_ZnwmSt11align_val_t", "_ZdlPvSt11align_val_tRKSt9nothrow_t" },
+ {"_ZnwmSt11align_val_tRKSt9nothrow_t", "_ZdlPvmSt11align_val_t" },
+ {"_ZnwmSt11align_val_tRKSt9nothrow_t", "_ZdlPvSt11align_val_t" },
+ {"_ZnwmSt11align_val_tRKSt9nothrow_t", "_ZdlPvSt11align_val_tRKSt9nothrow_t" },
+ /* [] operators. */
+ { "_Znam", "_ZdaPv" },
+ { "_Znam", "_ZdaPvm" },
+ { "_Znam", "_ZdaPvRKSt9nothrow_t" },
+ { "_ZnamRKSt9nothrow_t", "_ZdaPv" },
+ { "_ZnamRKSt9nothrow_t", "_ZdaPvm" },
+ { "_ZnamRKSt9nothrow_t", "_ZdaPvRKSt9nothrow_t" },
+ /* [] operators with alignment. */
+ { "_ZnamSt11align_val_t", "_ZdaPvmSt11align_val_t" },
+ { "_ZnamSt11align_val_t", "_ZdaPvSt11align_val_t" },
+ { "_ZnamSt11align_val_t", "_ZdaPvSt11align_val_tRKSt9nothrow_t" },
+ { "_ZnamSt11align_val_tRKSt9nothrow_t", "_ZdaPvmSt11align_val_t"},
+ { "_ZnamSt11align_val_tRKSt9nothrow_t", "_ZdaPvSt11align_val_t"},
+ { "_ZnamSt11align_val_tRKSt9nothrow_t", "_ZdaPvSt11align_val_tRKSt9nothrow_t"},
+ { NULL, NULL }
+ };
+
+ for (unsigned i = 0; valid_pairs[i][0] != NULL; i++)
+ if (strcmp (new_name, valid_pairs[i][0]) == 0
+ && strcmp (delete_name, valid_pairs[i][1]) == 0)
+ return true;
+
+ return false;
+}
+
/* Propagate necessity using the operands of necessary statements.
Process the uses on each statement in the worklist, and add all
feeding statements which contribute to the calculation of this
@@ -824,16 +880,23 @@ 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)
+ {
+ if (!valid_new_delete_pair_p (def_stmt, 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;
}
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-04-14 10:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-14 7:11 [gcc(refs/users/marxin/heads/PR94314-fix-new-delete-pair-deletion-part-3)] List valid pairs for new and delete operators Martin Liska
-- strict thread matches above, loose matches on Subject: below --
2020-04-14 10:53 Martin Liska
2020-04-14 6:40 Martin Liska
2020-04-10 8:27 Martin Liska
2020-04-10 8:04 Martin Liska
2020-04-09 14:12 Martin Liska
2020-04-09 13:53 Martin Liska
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).