summaryrefslogtreecommitdiff
path: root/gcc/ipa-prop.c
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-26 20:03:21 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2010-10-26 20:03:21 +0000
commitc79b54af83c8031caac515081fb7c56a127b90e3 (patch)
treee5391ba973e0b1e273c9037981ed8ac55099e03f /gcc/ipa-prop.c
parent8dfbafc807ba917d346d622915073bd4450ad344 (diff)
downloadgcc-c79b54af83c8031caac515081fb7c56a127b90e3.tar.gz
2010-10-26 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 165980 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@165983 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ipa-prop.c')
-rw-r--r--gcc/ipa-prop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 9ffbb3f90a9..b3d9f91dcea 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -2186,7 +2186,7 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
if (TREE_CODE (base) == ADDR_EXPR
&& DECL_P (TREE_OPERAND (base, 0)))
- off = build_int_cst (reference_alias_ptr_type (base),
+ off = build_int_cst (TREE_TYPE (base),
adj->offset / BITS_PER_UNIT);
else if (TREE_CODE (base) != ADDR_EXPR
&& POINTER_TYPE_P (TREE_TYPE (base)))
@@ -2209,7 +2209,7 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
}
else if (TREE_CODE (base) == MEM_REF)
{
- off = build_int_cst (TREE_TYPE (TREE_OPERAND (base,1)),
+ off = build_int_cst (TREE_TYPE (TREE_OPERAND (base, 1)),
base_offset
+ adj->offset / BITS_PER_UNIT);
off = int_const_binop (PLUS_EXPR, TREE_OPERAND (base, 1),
@@ -2218,7 +2218,7 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
}
else
{
- off = build_int_cst (reference_alias_ptr_type (base),
+ off = build_int_cst (reference_alias_ptr_type (prev_base),
base_offset
+ adj->offset / BITS_PER_UNIT);
base = build_fold_addr_expr (base);