diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 461e326acd7..7ac65284267 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-29  Richard Guenther  <rguenther@suse.de>
+
+	* gimple-fold.c (gimple_fold_stmt_to_constant_1): Set a location
+	on the built ADDR_EXPR.
+
 2011-08-29  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/50215
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 12b2d4e4a4b..19f34000654 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -2987,8 +2987,9 @@ gimple_fold_stmt_to_constant_1 (gimple stmt, tree (*valueize) (tree))
 		  && TREE_CODE (op1) == INTEGER_CST)
 		{
 		  tree off = fold_convert (ptr_type_node, op1);
-		  return build_fold_addr_expr
-			   (fold_build2 (MEM_REF,
+		  return build_fold_addr_expr_loc
+			   (loc,
+			    fold_build2 (MEM_REF,
 					 TREE_TYPE (TREE_TYPE (op0)),
 					 unshare_expr (op0), off));
 		}