diff options
| -rw-r--r-- | gcc/cp/call.c | 9 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/flifetime-dse8.C | 12 |
4 files changed, 20 insertions, 5 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index c62d9e2..4726e57 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -8430,10 +8430,12 @@ conv_binds_ref_to_prvalue (conversion *c) } /* Call the trivial destructor for INSTANCE, which can be either an lvalue of - class type or a pointer to class type. */ + class type or a pointer to class type. If NO_PTR_DEREF is true and + INSTANCE has pointer type, clobber the pointer rather than what it points + to. */ tree -build_trivial_dtor_call (tree instance) +build_trivial_dtor_call (tree instance, bool no_ptr_deref) { gcc_assert (!is_dummy_object (instance)); @@ -8443,7 +8445,8 @@ build_trivial_dtor_call (tree instance) return fold_convert (void_type_node, instance); } - if (INDIRECT_TYPE_P (TREE_TYPE (instance))) + if (INDIRECT_TYPE_P (TREE_TYPE (instance)) + && (!no_ptr_deref || TYPE_REF_P (TREE_TYPE (instance)))) { if (VOID_TYPE_P (TREE_TYPE (TREE_TYPE (instance)))) goto no_clobber; diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3f3717a..2b7c9b9 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6248,7 +6248,7 @@ extern bool null_member_pointer_value_p (tree); extern bool sufficient_parms_p (const_tree); extern tree type_decays_to (tree); extern tree extract_call_expr (tree); -extern tree build_trivial_dtor_call (tree); +extern tree build_trivial_dtor_call (tree, bool = false); extern tree build_user_type_conversion (tree, tree, int, tsubst_flags_t); extern tree build_new_function_call (tree, vec<tree, va_gc> **, diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index b71ca07..3877a0e 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2713,7 +2713,7 @@ finish_call_expr (tree fn, vec<tree, va_gc> **args, bool disallow_virtual, denoted by the object expression of the class member access. */ tree ob = TREE_OPERAND (fn, 0); if (obvalue_p (ob)) - result = build_trivial_dtor_call (ob); + result = build_trivial_dtor_call (ob, true); else /* No location to clobber. */ result = convert_to_void (ob, ICV_STATEMENT, complain); diff --git a/gcc/testsuite/g++.dg/opt/flifetime-dse8.C b/gcc/testsuite/g++.dg/opt/flifetime-dse8.C new file mode 100644 index 0000000..eeb814e --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/flifetime-dse8.C @@ -0,0 +1,12 @@ +// PR c++/96721 +// { dg-do run } +// { dg-options "-O2 -flifetime-dse" } + +typedef int *T; + +int +main () +{ + T a = T (); + a.~T (); +} |