diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b1ad8511f2f..a6bb71835a7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-20  Jakub Jelinek  <jakub@redhat.com>
+	    Michael Matz  <matz@suse.de>
+
+	* tree-ssa-address.c (tree_mem_ref_addr): Convert offset to
+	sizetype.
+
 2010-08-20  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* ggc-common.c (ggc_mark_root_tab): New function, split out from...
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index 305a0135e55..77dfa60000d 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -299,6 +299,7 @@ tree_mem_ref_addr (tree type, tree mem_ref)
 
   if (offset && !integer_zerop (offset))
     {
+      offset = fold_convert (sizetype, offset);
       if (addr_off)
 	addr_off = fold_build2 (PLUS_EXPR, sizetype, addr_off, offset);
       else