diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4002376f8f9..6fb40c94840 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/56570
+	* tree-cfg.c (verify_expr_location_1): Verify locations for
+	DECL_DEBUG_EXPR.
+	* tree-sra.c (create_access_replacement): Strip locations
+	from DECL_DEBUG_EXPRs.
+
 2013-03-08  Richard Biener  <rguenther@suse.de>
 
 	* tree-inline.c (expand_call_inline): Do not associate
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 7be44e42e4b..5466e8b43a1 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -4523,6 +4523,15 @@ verify_expr_location_1 (tree *tp, int *walk_subtrees, void *data)
 {
   struct pointer_set_t *blocks = (struct pointer_set_t *) data;
 
+  if (TREE_CODE (*tp) == VAR_DECL
+      && DECL_DEBUG_EXPR_IS_FROM (*tp))
+    {
+      tree t = DECL_DEBUG_EXPR (*tp);
+      tree addr = walk_tree (&t, verify_expr_location_1, blocks, NULL);
+      if (addr)
+	return addr;
+    }
+
   if (!EXPR_P (*tp))
     {
       *walk_subtrees = false;
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 67212c204c4..35dcd432712 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -1917,7 +1917,7 @@ create_access_replacement (struct access *access)
       && !DECL_ARTIFICIAL (access->base))
     {
       char *pretty_name = make_fancy_name (access->expr);
-      tree debug_expr = unshare_expr (access->expr), d;
+      tree debug_expr = unshare_expr_without_location (access->expr), d;
       bool fail = false;
 
       DECL_NAME (repl) = get_identifier (pretty_name);