From 451773378f6808ce2b1e1d4eaed40b164ad590da Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 8 Jan 2016 11:01:12 -0500 Subject: [PATCH] PR c++/68983 (BE) PR c++/67557 gcc/ * function.c (assign_temp): Guard against TREE_ADDRESSABLE types here. * expr.c (store_field): Not here. * tree-cfgcleanup.c (fixup_noreturn_call): Don't clear LHS of a call with TREE_ADDRESSABLE type. * tree-cfg.c (verify_gimple_call): Adjust. gcc/cp/ * cvt.c (convert_to_void): Don't strip a TARGET_EXPR of TREE_ADDRESSABLE type. From-SVN: r232167 --- gcc/ChangeLog | 10 ++++++++++ gcc/cp/ChangeLog | 5 +++++ gcc/cp/cvt.c | 5 +++-- gcc/expr.c | 3 --- gcc/function.c | 4 ++++ gcc/testsuite/g++.dg/init/base1.C | 14 ++++++++++++++ gcc/tree-cfg.c | 3 ++- gcc/tree-cfgcleanup.c | 6 ++++-- 8 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/init/base1.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 858938afb98f..4ffc776839fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2016-01-08 Jason Merrill + + PR c++/68983 + PR c++/67557 + * function.c (assign_temp): Guard against TREE_ADDRESSABLE types here. + * expr.c (store_field): Not here. + * tree-cfgcleanup.c (fixup_noreturn_call): Don't clear LHS of a + call with TREE_ADDRESSABLE type. + * tree-cfg.c (verify_gimple_call): Adjust. + 2016-01-08 Olivier Hainque * config/vxworks.h (VXWORKS_LIBGCC_SPEC): Don't link shared RTPs with diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 33680a4fcd77..4e32d0dcd21a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2016-01-08 Jason Merrill + PR c++/68983 + PR c++/67557 + * cvt.c (convert_to_void): Don't strip a TARGET_EXPR of + TREE_ADDRESSABLE type. + PR c++/68983 PR c++/67557 * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index d79f13bce704..f381f9b38006 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1229,11 +1229,12 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) case TARGET_EXPR: /* Don't bother with the temporary object returned from a function if - we don't use it and don't need to destroy it. We'll still + we don't use it, don't need to destroy it, and won't abort in + assign_temp. We'll still allocate space for it in expand_call or declare_return_variable, but we don't need to track it through all the tree phases. */ if (TARGET_EXPR_IMPLICIT_P (expr) - && TYPE_HAS_TRIVIAL_DESTRUCTOR (TREE_TYPE (expr))) + && !TREE_ADDRESSABLE (TREE_TYPE (expr))) { tree init = TARGET_EXPR_INITIAL (expr); if (TREE_CODE (init) == AGGR_INIT_EXPR diff --git a/gcc/expr.c b/gcc/expr.c index 8973893fad65..0c5dff8be97a 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -6655,9 +6655,6 @@ store_field (rtx target, HOST_WIDE_INT bitsize, HOST_WIDE_INT bitpos, rtx temp; gimple *nop_def; - /* Using bitwise copy is not safe for TREE_ADDRESSABLE types. */ - gcc_assert (!TREE_ADDRESSABLE (TREE_TYPE (exp))); - /* If EXP is a NOP_EXPR of precision less than its mode, then that implies a mask operation. If the precision is the same size as the field we're storing into, that mask is redundant. This is diff --git a/gcc/function.c b/gcc/function.c index 603ea80e977b..1ac8e26daabe 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -956,6 +956,10 @@ assign_temp (tree type_or_decl, int memory_required, unsignedp = TYPE_UNSIGNED (type); #endif + /* Allocating temporaries of TREE_ADDRESSABLE type must be done in the front + end. See also create_tmp_var for the gimplification-time check. */ + gcc_assert (!TREE_ADDRESSABLE (type) && COMPLETE_TYPE_P (type)); + if (mode == BLKmode || memory_required) { HOST_WIDE_INT size = int_size_in_bytes (type); diff --git a/gcc/testsuite/g++.dg/init/base1.C b/gcc/testsuite/g++.dg/init/base1.C new file mode 100644 index 000000000000..bce2f17e79f7 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/base1.C @@ -0,0 +1,14 @@ +// PR c++/68983 + +class SvxOptionsGrid { + int nFldDrawX; + bool bEqualGrid; +public: + ~SvxOptionsGrid(); +}; +class A : SvxOptionsGrid { +public: + A(SvxOptionsGrid p1) : SvxOptionsGrid(p1) {} +}; +SvxOptionsGrid a; +void fn1() { A b(a); } diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index e75774ebc9bc..dbfa506c5d8b 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -3371,7 +3371,8 @@ verify_gimple_call (gcall *stmt) if (lhs && gimple_call_ctrl_altering_p (stmt) && gimple_call_noreturn_p (stmt) - && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST) + && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST + && !TREE_ADDRESSABLE (TREE_TYPE (lhs))) { error ("LHS in noreturn call"); return true; diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c index bd7c3c973e8f..46d0fa3ee0dd 100644 --- a/gcc/tree-cfgcleanup.c +++ b/gcc/tree-cfgcleanup.c @@ -601,9 +601,11 @@ fixup_noreturn_call (gimple *stmt) /* If there is an LHS, remove it, but only if its type has fixed size. The LHS will need to be recreated during RTL expansion and creating - temporaries of variable-sized types is not supported. */ + temporaries of variable-sized types is not supported. Also don't + do this with TREE_ADDRESSABLE types, as assign_temp will abort. */ tree lhs = gimple_call_lhs (stmt); - if (lhs && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST) + if (lhs && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST + && !TREE_ADDRESSABLE (TREE_TYPE (lhs))) { gimple_call_set_lhs (stmt, NULL_TREE); -- 2.47.2