diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee1d9fcaf553595b2675b606091e228690cb71aa..a0c6c3e9ad5959631da358e8143f9d9126a86171 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-05  Sterling Augustine  <saugustine@google.com>
+	    Cary Coutant  <ccoutant@google.com>
+
+	PR debug/55364
+	* dwarf2out.c (resolve_addr): Don't call
+	remove_loc_list_addr_table_entries a second time for the same
+	expression.
+
 2013-03-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/56510
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4e75407fedfcfe943a0109634140b08b8fece925..d7faaac9f85905475d4fe709c5e8beeb1979e89f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -22691,8 +22691,6 @@ resolve_addr (dw_die_ref die)
 	    else
 	      {
 		loc->replaced = 1;
-                if (dwarf_split_debug_info)
-                  remove_loc_list_addr_table_entries (loc->expr);
 		loc->dw_loc_next = *start;
 	      }
 	  }