2014-07-31 Richard Biener <rguenther@suse.de>

	* lto-streamer.h (struct output_block): Remove global.
	(struct data_in): Remove labels, num_named_labels and
	num_unnamed_labels.
	* lto-streamer-in.c (lto_data_in_delete): Do not free labels.
	* lto-streamer-out.c (produce_asm_for_decls): Do not set global.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213340 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 64d2fa3..5b24fcd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-07-31  Richard Biener  <rguenther@suse.de>
+
+       * lto-streamer.h (struct output_block): Remove global.
+       (struct data_in): Remove labels, num_named_labels and
+       num_unnamed_labels.
+       * lto-streamer-in.c (lto_data_in_delete): Do not free labels.
+       * lto-streamer-out.c (produce_asm_for_decls): Do not set global.
+
 2014-07-31  Marc Glisse  <marc.glisse@inria.fr>
 
        PR c++/60517

diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 3ece457..698f926 100644 (file)
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -1427,6 +1427,5 @@ lto_data_in_delete (struct data_in *data_in)
 {
   data_in->globals_resolution.release ();
   streamer_tree_cache_delete (data_in->reader_cache);
-  free (data_in->labels);
   free (data_in);
 }

diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 6b3f78f..2a32958 100644 (file)
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -2632,7 +2632,6 @@ produce_asm_for_decls (void)
   int32_t num_decl_states;
 
   ob = create_output_block (LTO_section_decls);
-  ob->global = true;
 
   memset (&header, 0, sizeof (struct lto_decl_header));
 

diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 1d728f6..eef86a8 100644 (file)
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -696,9 +696,6 @@ struct output_block
   int current_line;
   int current_col;
 
-  /* True if writing globals and types.  */
-  bool global;
-
   /* Cache of nodes written in this section.  */
   struct streamer_tree_cache_d *writer_cache;
 
@@ -714,22 +711,12 @@ struct data_in
   /* The global decls and types.  */
   struct lto_file_decl_data *file_data;
 
-  /* All of the labels.  */
-  tree *labels;
-
   /* The string table.  */
   const char *strings;
 
   /* The length of the string table.  */
   unsigned int strings_len;
 
-  /* Number of named labels.  Used to find the index of unnamed labels
-     since they share space with the named labels.  */
-  unsigned int num_named_labels;
-
-  /* Number of unnamed labels.  */
-  unsigned int num_unnamed_labels;
-
   /* Maps each reference number to the resolution done by the linker. */
   vec<ld_plugin_symbol_resolution_t> globals_resolution;