diff options
| author | Jason Merrill <jason@redhat.com> | 2010-02-17 17:51:51 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-02-17 17:51:51 -0500 |
| commit | 9ba5971590cfc51a55c277c61aad4ec64bd2507d (patch) | |
| tree | 2e7d21f1a571171af5e129b32829cd1f539a3818 /gcc/cp/call.c | |
| parent | 77278f4acb960227639ab6ad6ded471f82503f51 (diff) | |
| download | gcc-9ba5971590cfc51a55c277c61aad4ec64bd2507d.zip gcc-9ba5971590cfc51a55c277c61aad4ec64bd2507d.tar.gz gcc-9ba5971590cfc51a55c277c61aad4ec64bd2507d.tar.bz2 | |
re PR c++/43075 (20_util/bind/ref2.cc FAILs)
PR c++/43075
* call.c (build_over_call): Don't create zero-sized assignments.
* cp-gimplify.c (cp_genericize_r): Don't remove them here.
* cp-objcp-common.c (cp_expr_size): Remove.
* cp-tree.h: Remove prototype.
From-SVN: r156842
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 54254c3..5e66c62 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5782,8 +5782,20 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) { tree to = stabilize_reference (cp_build_indirect_ref (fa, RO_NULL, complain)); + tree type = TREE_TYPE (to); - val = build2 (INIT_EXPR, DECL_CONTEXT (fn), to, arg); + if (TREE_CODE (arg) != TARGET_EXPR + && TREE_CODE (arg) != AGGR_INIT_EXPR + && is_really_empty_class (type)) + { + /* Avoid copying empty classes. */ + val = build2 (COMPOUND_EXPR, void_type_node, to, arg); + TREE_NO_WARNING (val) = 1; + val = build2 (COMPOUND_EXPR, type, val, to); + TREE_NO_WARNING (val) = 1; + } + else + val = build2 (INIT_EXPR, DECL_CONTEXT (fn), to, arg); return val; } } @@ -5797,7 +5809,15 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) tree as_base = CLASSTYPE_AS_BASE (type); tree arg = argarray[1]; - if (tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (as_base))) + if (is_really_empty_class (type)) + { + /* Avoid copying empty classes. */ + val = build2 (COMPOUND_EXPR, void_type_node, to, arg); + TREE_NO_WARNING (val) = 1; + val = build2 (COMPOUND_EXPR, type, val, to); + TREE_NO_WARNING (val) = 1; + } + else if (tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (as_base))) { arg = cp_build_indirect_ref (arg, RO_NULL, complain); val = build2 (MODIFY_EXPR, TREE_TYPE (to), to, arg); |