diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1878db88e0..0229f63f8f6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* cfglayout.c (insn_locators_alloc): Initialize curr_location and
+	last_location to UNKNOWN_LOCATION.
+
 2011-03-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/48349
diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index 464663642c7..548e21f7f4f 100644
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -253,8 +253,8 @@ insn_locators_alloc (void)
   locations_locators_locs = VEC_alloc (int, heap, 32);
   locations_locators_vals = VEC_alloc (location_t, heap, 32);
 
-  last_location = -1;
-  curr_location = -1;
+  curr_location = UNKNOWN_LOCATION;
+  last_location = UNKNOWN_LOCATION;
   curr_block = NULL;
   last_block = NULL;
   curr_rtl_loc = 0;