diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a8ada7ccf61..187b81c08c6a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-20  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/54031
+	* tree-ssa-ccp.c (get_value_from_alignment): Use
+	get_pointer_alignment_1.
+
 2012-07-20  Richard Guenther  <rguenther@suse.de>
 
 	* tree-inline.c (add_local_variables): Remove check_var_ann
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 3f88f39f0963..83ed653ac032 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -510,7 +510,7 @@ get_value_from_alignment (tree expr)
 
   gcc_assert (TREE_CODE (expr) == ADDR_EXPR);
 
-  get_object_alignment_1 (TREE_OPERAND (expr, 0), &align, &bitpos);
+  get_pointer_alignment_1 (expr, &align, &bitpos);
   val.mask
     = double_int_and_not (POINTER_TYPE_P (type) || TYPE_UNSIGNED (type)
 			  ? double_int_mask (TYPE_PRECISION (type))