diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff81abd699c..cc6d64c4f10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-22  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/52329
+	* gimple-fold.c (fold_stmt_1): Also canonicalize ADDR_EXPRs
+	for GIMPLE_DEBUG stmts.
+ 
 2012-02-22  Martin Jambor  <mjambor@suse.cz>
 
 	PR middle-end/51782
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index eae4cbe4615..5ba7178b0da 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -1250,6 +1250,18 @@ fold_stmt_1 (gimple_stmt_iterator *gsi, bool inplace)
 		  changed = true;
 		}
 	    }
+	  else if (val
+		   && TREE_CODE (val) == ADDR_EXPR)
+	    {
+	      tree ref = TREE_OPERAND (val, 0);
+	      tree tem = maybe_fold_reference (ref, false);
+	      if (tem)
+		{
+		  tem = build_fold_addr_expr_with_type (tem, TREE_TYPE (val));
+		  gimple_debug_bind_set_value (stmt, tem);
+		  changed = true;
+		}
+	    }
 	}
       break;