Skip to content

R
riscv-gcc-1
Commit a80903ff by Eric Botcazou Committed by Eric Botcazou
Options

* emit-rtl.c (set_mem_attributes_minus_bitpos): Fix formatting issues. 

From-SVN: r161961
parent 7aa0849a
Showing with 24 additions and 21 deletions
gcc/ChangeLog
2010-07-08 Eric Botcazou <ebotcazou@adacore.com>
* emit-rtl.c (set_mem_attributes_minus_bitpos): Fix formatting issues.
2010-07-08 Richard Guenther <rguenther@suse.de> 2010-07-08 Richard Guenther <rguenther@suse.de>
* tree-ssa-sccvn.c (vn_reference_maybe_forwprop_address): Fix * tree-ssa-sccvn.c (vn_reference_maybe_forwprop_address): Fix
......
gcc/emit-rtl.c
...@@ -1611,27 +1611,26 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp, ...@@ -1611,27 +1611,26 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp,
/* We can set the alignment from the type if we are making an object, /* We can set the alignment from the type if we are making an object,
this is an INDIRECT_REF, or if TYPE_ALIGN_OK. */ this is an INDIRECT_REF, or if TYPE_ALIGN_OK. */
if (objectp || TREE_CODE (t) == INDIRECT_REF if (objectp || TREE_CODE (t) == INDIRECT_REF || TYPE_ALIGN_OK (type))
|| TYPE_ALIGN_OK (type))
align = MAX (align, TYPE_ALIGN (type)); align = MAX (align, TYPE_ALIGN (type));
else if (TREE_CODE (t) == MEM_REF) else if (TREE_CODE (t) == MEM_REF)
{ {
tree op0 = TREE_OPERAND (t, 0);
unsigned HOST_WIDE_INT aoff = BITS_PER_UNIT; unsigned HOST_WIDE_INT aoff = BITS_PER_UNIT;
if (host_integerp (TREE_OPERAND (t, 1), 1)) if (host_integerp (TREE_OPERAND (t, 1), 1))
{ {
unsigned HOST_WIDE_INT ioff = TREE_INT_CST_LOW (TREE_OPERAND (t, 1)); unsigned HOST_WIDE_INT ioff = TREE_INT_CST_LOW (TREE_OPERAND (t, 1));
aoff = (ioff & -ioff) * BITS_PER_UNIT; aoff = (ioff & -ioff) * BITS_PER_UNIT;
} }
if (TREE_CODE (TREE_OPERAND (t, 0)) == ADDR_EXPR if (TREE_CODE (op0) == ADDR_EXPR && DECL_P (TREE_OPERAND (op0, 0)))
&& DECL_P (TREE_OPERAND (TREE_OPERAND (t, 0), 0))) align = MAX (align, DECL_ALIGN (TREE_OPERAND (op0, 0)));
align = MAX (align, else if (TREE_CODE (op0) == ADDR_EXPR
DECL_ALIGN (TREE_OPERAND (TREE_OPERAND (t, 0), 0))); && CONSTANT_CLASS_P (TREE_OPERAND (op0, 0)))
else if (TREE_CODE (TREE_OPERAND (t, 0)) == ADDR_EXPR
&& CONSTANT_CLASS_P (TREE_OPERAND (TREE_OPERAND (t, 0), 0)))
{ {
align = TYPE_ALIGN (TREE_TYPE (TREE_OPERAND (TREE_OPERAND (t, 0), 0))); align = TYPE_ALIGN (TREE_TYPE (TREE_OPERAND (op0, 0)));
#ifdef CONSTANT_ALIGNMENT #ifdef CONSTANT_ALIGNMENT
align = CONSTANT_ALIGNMENT (TREE_OPERAND (TREE_OPERAND (t, 0), 0), align); align = CONSTANT_ALIGNMENT (TREE_OPERAND (op0, 0), align);
#endif #endif
} }
else else
...@@ -1639,19 +1638,19 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp, ...@@ -1639,19 +1638,19 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp,
alignment information from types. */ alignment information from types. */
align = MAX (align, align = MAX (align,
TYPE_ALIGN (TREE_TYPE (TREE_TYPE (TREE_OPERAND (t, 1))))); TYPE_ALIGN (TREE_TYPE (TREE_TYPE (TREE_OPERAND (t, 1)))));
if (!integer_zerop (TREE_OPERAND (t, 1))
&& aoff < align) if (!integer_zerop (TREE_OPERAND (t, 1)) && aoff < align)
align = aoff; align = aoff;
} }
else
if (TREE_CODE (t) == MISALIGNED_INDIRECT_REF) else if (TREE_CODE (t) == MISALIGNED_INDIRECT_REF)
{ {
if (integer_zerop (TREE_OPERAND (t, 1))) if (integer_zerop (TREE_OPERAND (t, 1)))
/* We don't know anything about the alignment. */ /* We don't know anything about the alignment. */
align = BITS_PER_UNIT; align = BITS_PER_UNIT;
else else
align = tree_low_cst (TREE_OPERAND (t, 1), 1); align = tree_low_cst (TREE_OPERAND (t, 1), 1);
} }
/* If the size is known, we can set that. */ /* If the size is known, we can set that. */
if (TYPE_SIZE_UNIT (type) && host_integerp (TYPE_SIZE_UNIT (type), 1)) if (TYPE_SIZE_UNIT (type) && host_integerp (TYPE_SIZE_UNIT (type), 1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment