aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-inline.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2016-03-05 07:50:23 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2016-03-05 07:50:23 +0100
commitdf762bb20ae6b04ecfb732400e1db6dd55b9f0de (patch)
tree04ee91462eeefafc7e167012c44ecd0480dfa81a /gcc/tree-inline.c
parent7d461295b8416387baf6875ab975d5a000299662 (diff)
downloadgcc-df762bb20ae6b04ecfb732400e1db6dd55b9f0de.zip
gcc-df762bb20ae6b04ecfb732400e1db6dd55b9f0de.tar.gz
gcc-df762bb20ae6b04ecfb732400e1db6dd55b9f0de.tar.bz2
re PR c++/70084 (va_arg ((ap), int) regression on s390*-*)
PR c++/70084 * tree-inline.c (copy_tree_body_r): When cancelling ADDR_EXPR of INDIRECT_REF and ADDR_EXPR changed type, fold_convert it to the right type. * g++.dg/expr/stdarg3.C: New test. From-SVN: r234004
Diffstat (limited to 'gcc/tree-inline.c')
-rw-r--r--gcc/tree-inline.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 073c1c7..d52e0c6 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1266,7 +1266,12 @@ copy_tree_body_r (tree *tp, int *walk_subtrees, void *data)
/* Handle the case where we substituted an INDIRECT_REF
into the operand of the ADDR_EXPR. */
if (TREE_CODE (TREE_OPERAND (*tp, 0)) == INDIRECT_REF)
- *tp = TREE_OPERAND (TREE_OPERAND (*tp, 0), 0);
+ {
+ tree t = TREE_OPERAND (TREE_OPERAND (*tp, 0), 0);
+ if (TREE_TYPE (t) != TREE_TYPE (*tp))
+ t = fold_convert (remap_type (TREE_TYPE (*tp), id), t);
+ *tp = t;
+ }
else
recompute_tree_invariant_for_addr_expr (*tp);