From: Jan Hubicka <hubicka@ucw.cz>
Date: Mon, 8 Jun 2015 22:10:35 +0000 (+0200)
Subject: lto-streamer-out.c (lto_output_location): Stream reserved locations correctly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44433db051a923a6e32baa8e448ec8cf5a88f5f8;p=gcc.git

lto-streamer-out.c (lto_output_location): Stream reserved locations correctly.


	* lto-streamer-out.c (lto_output_location): Stream
	reserved locations correctly.
	* lto-streamer-in.c (lto_output_location): Likewise.

From-SVN: r224251
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38fe3694f68..f8e8e6de4ce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-08  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto-streamer-out.c (lto_output_location): Stream
+	reserved locations correctly.
+	* lto-streamer-in.c (lto_output_location): Likewise.
+
 2015-06-08  Andrew MacLeod  <amacleod@redhat.com>
 
 	* coretypes.h: Include hash-table.h and hash-set.h for host files.
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index b4070de288a..7729b6cf697 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -272,12 +272,13 @@ lto_location_cache::input_location (location_t *loc, struct bitpack_d *bp,
 
   gcc_assert (current_cache == this);
 
-  if (bp_unpack_value (bp, 1))
-    {
-      *loc = UNKNOWN_LOCATION;
-      return;
-    }
-  *loc = BUILTINS_LOCATION + 1;
+  *loc = bp_unpack_int_in_range (bp, "location", 0, RESERVED_LOCATION_COUNT);
+
+  if (*loc < RESERVED_LOCATION_COUNT)
+    return;
+
+  /* Keep value RESERVED_LOCATION_COUNT in *loc as linemap lookups will
+     ICE on it.  */
 
   file_change = bp_unpack_value (bp, 1);
   line_change = bp_unpack_value (bp, 1);
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index e14761bf64a..9ee43120080 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -196,8 +196,10 @@ lto_output_location (struct output_block *ob, struct bitpack_d *bp,
   expanded_location xloc;
 
   loc = LOCATION_LOCUS (loc);
-  bp_pack_value (bp, loc == UNKNOWN_LOCATION, 1);
-  if (loc == UNKNOWN_LOCATION)
+  bp_pack_int_in_range (bp, 0, RESERVED_LOCATION_COUNT,
+		        loc < RESERVED_LOCATION_COUNT
+			? loc : RESERVED_LOCATION_COUNT);
+  if (loc < RESERVED_LOCATION_COUNT)
     return;
 
   xloc = expand_location (loc);