aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/builtins.c2
-rw-r--r--gcc/expr.c1
3 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47731da..fe0de91 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-17 Richard Guenther <rguenther@suse.de>
+
+ PR middle-end/42397
+ * builtins.c (get_object_alignment): Properly deal with
+ a CONST_DECL base.
+ * expr.c (emit_block_move_hints): Assert the alignment makes
+ sense.
+
2009-12-17 Uros Bizjak <ubizjak@gmail.com>
PR target/32280
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 75a7e10..53d74a2 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -323,6 +323,8 @@ get_object_alignment (tree exp, unsigned int align, unsigned int max_align)
offset = next_offset;
}
}
+ if (TREE_CODE (exp) == CONST_DECL)
+ exp = DECL_INITIAL (exp);
if (DECL_P (exp))
align = MIN (inner, DECL_ALIGN (exp));
#ifdef CONSTANT_ALIGNMENT
diff --git a/gcc/expr.c b/gcc/expr.c
index 13ae5ff..d1cd815 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -1194,6 +1194,7 @@ emit_block_move_hints (rtx x, rtx y, rtx size, enum block_op_methods method,
}
align = MIN (MEM_ALIGN (x), MEM_ALIGN (y));
+ gcc_assert (align >= BITS_PER_UNIT);
gcc_assert (MEM_P (x));
gcc_assert (MEM_P (y));