public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH 2/3] Add lto-dump tool.
  2019-03-14 14:00 [PATCH 0/3][stage1] [PATCH v2] LTO dump tool marxin
@ 2019-03-14 14:00 ` marxin
  2019-04-26 13:14   ` Richard Biener
  2022-10-28 10:14   ` Thomas Schwinge
  2019-03-14 14:00 ` [PATCH 3/3] Fix GNU coding style in lto-common.c marxin
  2019-03-14 14:06 ` [PATCH 1/3] Split part of functionality from lto.c to lto-common.c marxin
  2 siblings, 2 replies; 9+ messages in thread
From: marxin @ 2019-03-14 14:00 UTC (permalink / raw)
  To: gcc-patches; +Cc: hrishikeshparag, hubicka

[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]


gcc/ChangeLog:

2019-03-14  Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>
	    Martin Liska  <mliska@suse.cz>

	* Makefile.in: Add lto-dump.texi.
	* cgraph.h: Add new functions dump_visibility and
	dump_type_name.
	* doc/gcc.texi: Include lto-dump section.
	* doc/lto-dump.texi: New file.
	* dumpfile.c (dump_switch_p_1): Use parse_dump_option.
	(parse_dump_option): Factor out this function.
	* dumpfile.h (enum dump_flag): Add new value TDF_ERROR.
	(parse_dump_option): Export the function.
	* symtab.c (symtab_node::dump_visibility): New function.
	(symtab_node::dump_type_name): Likewise.

gcc/lto/ChangeLog:

2019-03-14  Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>
	    Martin Liska  <mliska@suse.cz>

	* Make-lang.in: Add lto_dump-related definition.
	* config-lang.in: Likewise.
	* lang.opt: Add new language LTODump and options related
	to LTO dump tool.
	* lto-common.c (lto_read_decls): Support type statistics dump.
	(lto_file_read): Likewise for object files.
	* lto-dump.c: New file.
	* lto-lang.c (lto_option_lang_mask): Move from ..
	* lto.c (lto_option_lang_mask): .. here.
	* lto.h (lto_option_lang_mask): New declaration.
---
 gcc/Makefile.in        |   2 +-
 gcc/cgraph.h           |   6 +
 gcc/doc/gcc.texi       |   5 +
 gcc/doc/lto-dump.texi  | 131 ++++++++++++++++
 gcc/dumpfile.c         |  85 ++++++----
 gcc/dumpfile.h         |   5 +
 gcc/lto/Make-lang.in   |  20 ++-
 gcc/lto/config-lang.in |   4 +-
 gcc/lto/lang.opt       |  62 ++++++++
 gcc/lto/lto-common.c   |  40 +++++
 gcc/lto/lto-dump.c     | 344 +++++++++++++++++++++++++++++++++++++++++
 gcc/lto/lto-lang.c     |   6 -
 gcc/lto/lto.c          |   6 +
 gcc/lto/lto.h          |   2 +
 gcc/symtab.c           |  17 ++
 15 files changed, 692 insertions(+), 43 deletions(-)
 create mode 100644 gcc/doc/lto-dump.texi
 create mode 100644 gcc/lto/lto-dump.c


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-Add-lto-dump-tool.patch --]
[-- Type: text/x-patch; name="0002-Add-lto-dump-tool.patch", Size: 29328 bytes --]

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 508c674cbdc..c7e4ae94103 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3158,7 +3158,7 @@ TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi	\
 	 gcov.texi trouble.texi bugreport.texi service.texi		\
 	 contribute.texi compat.texi funding.texi gnu.texi gpl_v3.texi	\
 	 fdl.texi contrib.texi cppenv.texi cppopts.texi avr-mmcu.texi	\
-	 implement-c.texi implement-cxx.texi gcov-tool.texi gcov-dump.texi
+	 implement-c.texi implement-cxx.texi gcov-tool.texi gcov-dump.texi lto-dump.texi
 
 # we explicitly use $(srcdir)/doc/tm.texi here to avoid confusion with
 # the generated tm.texi; the latter might have a more recent timestamp,
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 9a19d83fffb..e2c2c00b5ed 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -119,6 +119,12 @@ public:
   /* Return dump name with assembler name.  */
   const char *dump_asm_name () const;
 
+  /* Return visibility name.  */
+  const char *dump_visibility () const;
+
+  /* Return type_name name.  */
+  const char *dump_type_name () const;
+
   /* Add node into symbol table.  This function is not used directly, but via
      cgraph/varpool node creation routines.  */
   void register_symbol (void);
diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi
index 5297b9cb5d0..4d03e3a6d96 100644
--- a/gcc/doc/gcc.texi
+++ b/gcc/doc/gcc.texi
@@ -68,6 +68,8 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b)
 * gcov: (gcc) Gcov.            @command{gcov}---a test coverage program.
 * gcov-tool: (gcc) Gcov-tool.  @command{gcov-tool}---an offline gcda profile processing program.
 * gcov-dump: (gcc) Gcov-dump.  @command{gcov-dump}---an offline gcda and gcno profile dump tool.
+* lto-dump: (gcc) lto-dump.    @command{lto-dump}---Tool for
+dumping LTO object files.
 @end direntry
 This file documents the use of the GNU compilers.
 @sp 1
@@ -142,6 +144,8 @@ Introduction, gccint, GNU Compiler Collection (GCC) Internals}.
 * Gcov::            @command{gcov}---a test coverage program.
 * Gcov-tool::       @command{gcov-tool}---an offline gcda profile processing program.
 * Gcov-dump::       @command{gcov-dump}---an offline gcda and gcno profile dump tool.
+* lto-dump::        @command{lto-dump}---Tool for dumping LTO
+object files.
 * Trouble::         If you have trouble using GCC.
 * Bugs::            How, why and where to report bugs.
 * Service::         How To Get Help with GCC
@@ -170,6 +174,7 @@ Introduction, gccint, GNU Compiler Collection (GCC) Internals}.
 @include gcov.texi
 @include gcov-tool.texi
 @include gcov-dump.texi
+@include lto-dump.texi
 @include trouble.texi
 @include bugreport.texi
 @include service.texi
diff --git a/gcc/doc/lto-dump.texi b/gcc/doc/lto-dump.texi
new file mode 100644
index 00000000000..d84397581c0
--- /dev/null
+++ b/gcc/doc/lto-dump.texi
@@ -0,0 +1,131 @@
+@c Copyright (C) 2018-2019 Free Software Foundation, Inc.
+@c This is part of the GCC manual.
+@c For copying conditions, see the file gcc.texi.
+
+@ignore
+@c man begin COPYRIGHT
+Copyright @copyright{} 2017-2018 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'' and ``Funding
+Free Software'', the Front-Cover texts being (a) (see below), and with
+the Back-Cover Texts being (b) (see below).  A copy of the license is
+included in the gfdl(7) man page.
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+     You have freedom to copy and modify this GNU Manual, like GNU
+     software.  Copies published by the Free Software Foundation raise
+     funds for GNU development.
+@c man end
+@c Set file name and title for the man page.
+@setfilename lto-dump
+@settitle Tool for dumping LTO object files.
+@end ignore
+
+@node lto-dump
+@chapter @command{lto-dump}---Tool for dumping LTO object files.
+
+@menu
+* lto-dump Intro::             Introduction to lto-dump.
+* Invoking lto-dump::          How to use lto-dump.
+@end menu
+
+@node lto-dump Intro
+@section Introduction to @command{lto-dump}
+@c man begin DESCRIPTION
+
+@command{lto-dump} is a tool you can use in conjunction with GCC to
+dump link time optimization object files.
+
+@c man end
+
+@node Invoking lto-dump
+@section Invoking @command{lto-dump}
+
+@smallexample
+Usage: lto-dump @r{[}@var{OPTION}@r{]} ... @var{objfiles}
+@end smallexample
+
+@command{lto-dump} accepts the following options:
+
+@ignore
+@c man begin SYNOPSIS
+lto-dump [@option{-list}]
+     [@option{-demangle}]
+     [@option{-defined-only}]
+     [@option{-print-value}]
+     [@option{-name-sort}]
+     [@option{-size-sort}]
+     [@option{-reverse-sort}]
+     [@option{-no-sort}]
+     [@option{-symbol=}]
+     [@option{-objects}]
+     [@option{-type-stats}]
+     [@option{-tree-stats}]
+     [@option{-gimple-stats}]
+     [@option{-dump-level=}]
+     [@option{-dump-body=}]
+     [@option{-help}] @var{lto-dump}
+@c man end
+@end ignore
+
+@c man begin OPTIONS
+@table @gcctabopt
+@item -list
+Dumps list of details of functions and variables.
+
+@item -demangle
+Dump the demangled output.
+
+@item -defined-only
+Dump only the defined symbols.
+
+@item -print-value
+Dump initial values of the variables.
+
+@item -name-sort
+Sort the symbols alphabetically.
+
+@item -size-sort
+Sort the symbols according to size.
+
+@item -reverse-sort
+Dump the symbols in reverse order.
+
+@item -no-sort
+Dump the symbols in order of occurrence.
+
+@item -symbol=
+Dump the details of specific symbol.
+
+@item -objects
+Dump the details of LTO objects.
+
+@item -type-stats
+Dump the statistics of tree types.
+
+@item -tree-stats
+Dump the statistics of trees.
+
+@item -gimple-stats
+Dump the statistics of gimple statements.
+
+@item -dump-level=
+For deciding the optimization level of body.
+
+@item -dump-body=
+Dump the specific gimple body.
+
+@item -help
+Display the dump tool help.
+
+@end table
+
+@c man end
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 14b6dfea75e..5263d3a2134 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -115,6 +115,7 @@ static struct dump_file_info dump_files[TDI_end] =
    in dumpfile.h and opt_info_options below. */
 static const kv_pair<dump_flags_t> dump_options[] =
 {
+  {"none", TDF_NONE},
   {"address", TDF_ADDRESS},
   {"asmname", TDF_ASMNAME},
   {"slim", TDF_SLIM},
@@ -1770,28 +1771,19 @@ gcc::dump_manager::update_dfi_for_opt_info (dump_file_info *dfi) const
   return true;
 }
 
-/* Parse ARG as a dump switch. Return nonzero if it is, and store the
-   relevant details in the dump_files array.  */
+/* Helper routine to parse -<dump format>[=filename]
+   and return the corresponding dump flag.  If POS_P is non-NULL,
+   assign start of filename into *POS_P.  */
 
-int
-gcc::dump_manager::
-dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob)
+dump_flags_t
+parse_dump_option (const char *option_value, const char **pos_p)
 {
-  const char *option_value;
   const char *ptr;
   dump_flags_t flags;
 
-  if (doglob && !dfi->glob)
-    return 0;
-
-  option_value = skip_leading_substring (arg, doglob ? dfi->glob : dfi->swtch);
-  if (!option_value)
-    return 0;
-
-  if (*option_value && *option_value != '-' && *option_value != '=')
-    return 0;
-
   ptr = option_value;
+  if (pos_p)
+    *pos_p = NULL;
 
   /* Retain "user-facing" and "internals" messages, but filter out
      those from an opt_problem being re-emitted at the top level
@@ -1805,14 +1797,13 @@ dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob)
       const char *end_ptr;
       const char *eq_ptr;
       unsigned length;
-
       while (*ptr == '-')
 	ptr++;
       end_ptr = strchr (ptr, '-');
       eq_ptr = strchr (ptr, '=');
 
       if (eq_ptr && !end_ptr)
-        end_ptr = eq_ptr;
+	end_ptr = eq_ptr;
 
       if (!end_ptr)
 	end_ptr = ptr + strlen (ptr);
@@ -1821,25 +1812,59 @@ dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob)
       for (option_ptr = dump_options; option_ptr->name; option_ptr++)
 	if (strlen (option_ptr->name) == length
 	    && !memcmp (option_ptr->name, ptr, length))
-          {
-            flags |= option_ptr->value;
+	  {
+	    flags |= option_ptr->value;
 	    goto found;
-          }
+	  }
 
       if (*ptr == '=')
-        {
+	{
           /* Interpret rest of the argument as a dump filename.  This
              filename overrides other command line filenames.  */
-          if (dfi->pfilename)
-            free (CONST_CAST (char *, dfi->pfilename));
-          dfi->pfilename = xstrdup (ptr + 1);
-          break;
-        }
+	  if (pos_p)
+	    *pos_p = ptr + 1;
+	  break;
+	}
       else
-        warning (0, "ignoring unknown option %q.*s in %<-fdump-%s%>",
-                 length, ptr, dfi->swtch);
-    found:;
+      {
+	warning (0, "ignoring unknown option %q.*s",
+		 length, ptr);
+	flags = TDF_ERROR;
+      }
+    found:
       ptr = end_ptr;
+  }
+
+  return flags;
+}
+
+/* Parse ARG as a dump switch.  Return nonzero if it is, and store the
+   relevant details in the dump_files array.  */
+
+int
+gcc::dump_manager::
+dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob)
+{
+  const char *option_value;
+  dump_flags_t flags = TDF_NONE;
+
+  if (doglob && !dfi->glob)
+    return 0;
+
+  option_value = skip_leading_substring (arg, doglob ? dfi->glob : dfi->swtch);
+  if (!option_value)
+    return 0;
+
+  if (*option_value && *option_value != '-' && *option_value != '=')
+    return 0;
+
+  const char *filename;
+  flags = parse_dump_option (option_value, &filename);
+  if (filename)
+    {
+      if (dfi->pfilename)
+  free (CONST_CAST (char *, dfi->pfilename));
+      dfi->pfilename = xstrdup (filename);
     }
 
   dfi->pstate = -1;
diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h
index 1f9ac427f75..9bcaa25b0a5 100644
--- a/gcc/dumpfile.h
+++ b/gcc/dumpfile.h
@@ -193,6 +193,9 @@ enum dump_flag
   /* Dumping for -fcompare-debug.  */
   TDF_COMPARE_DEBUG = (1 << 28),
 
+  /* For error.  */
+  TDF_ERROR = (1 << 26),
+
   /* All values.  */
   TDF_ALL_VALUES = (1 << 29) - 1
 };
@@ -501,6 +504,8 @@ extern void dump_end (int, FILE *);
 extern int opt_info_switch_p (const char *);
 extern const char *dump_flag_name (int);
 extern const kv_pair<optgroup_flags_t> optgroup_options[];
+extern dump_flags_t
+parse_dump_option (const char *, const char **);
 
 /* Global variables used to communicate with passes.  */
 extern FILE *dump_file;
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index b7ed96eac29..92487e1f53e 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -21,9 +21,12 @@
 
 # The name of the LTO compiler.
 LTO_EXE = lto1$(exeext)
+LTO_DUMP_EXE = lto-dump$(exeext)
 # The LTO-specific object files inclued in $(LTO_EXE).
 LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-common.o
 lto_OBJS = $(LTO_OBJS)
+LTO_DUMP_OBJS = lto/lto-lang.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-dump.o lto/lto-common.o
+lto_dump_OBJS = $(LTO_DUMP_OBJS)
 
 # this is only useful in a LTO bootstrap, but this does not work right
 # now. Should reenable after this is fixed, but only when LTO bootstrap
@@ -39,11 +42,14 @@ lto_OBJS = $(LTO_OBJS)
 
 # These hooks are used by the main GCC Makefile.  Consult that
 # Makefile for documentation.
-lto.all.cross: $(LTO_EXE)
-lto.start.encap: $(LTO_EXE)
+lto.all.cross: $(LTO_EXE) $(LTO_DUMP_EXE)
+lto.start.encap: $(LTO_EXE) $(LTO_DUMP_EXE)
 lto.rest.encap:
 lto.tags:
-lto.install-common:
+lto.install-common: installdirs
+	$(INSTALL_PROGRAM) $(LTO_DUMP_EXE) \
+	$(DESTDIR)/$(bindir)/$(LTO_DUMP_EXE)
+
 lto.install-man:
 lto.install-info:
 lto.dvi:
@@ -60,7 +66,7 @@ lto.srcinfo:
 lto.install-plugin:
 
 lto.mostlyclean:
-	rm -f $(LTO_OBJS) $(LTO_EXE) lto1.fda
+	rm -f $(LTO_OBJS) $(LTO_EXE) lto1.fda $(LTO_DUMP_OBJS) $(LTO_DUMP_EXE) lto-dump.fda
 
 lto.clean:
 lto.distclean:
@@ -81,6 +87,12 @@ $(LTO_EXE): $(LTO_OBJS) $(BACKEND) $(LIBDEPS)
 	+$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
 		$(LTO_OBJS) $(BACKEND) $(BACKENDLIBS) $(LIBS)
 
+$(LTO_DUMP_EXE): $(LTO_EXE) $(LTO_DUMP_OBJS) $(BACKEND) $(LIBDEPS)
+	+$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
+		$(LTO_DUMP_OBJS) $(BACKEND) $(BACKENDLIBS) $(LIBS)
+
+lto/lto-dump.o: $(LTO_EXE)
+
 lto1.fda: ../prev-gcc/lto1$(exeext) ../prev-gcc/$(PERF_DATA)
 	$(CREATE_GCOV) -binary ../prev-gcc/lto1$(exeext) -gcov lto1.fda -profile ../prev-gcc/$(PERF_DATA) -gcov_version 1
 
diff --git a/gcc/lto/config-lang.in b/gcc/lto/config-lang.in
index 07214365fd8..37c8f6e12b1 100644
--- a/gcc/lto/config-lang.in
+++ b/gcc/lto/config-lang.in
@@ -18,9 +18,9 @@
 # <http://www.gnu.org/licenses/>.
 
 language="lto"
-compilers="lto1\$(exeext)"
+compilers="lto1\$(exeext) lto-dump\$(exeext)"
 
-gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h \$(srcdir)/lto/lto-common.h \$(srcdir)/lto/lto-common.c"
+gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h \$(srcdir)/lto/lto-common.h \$(srcdir)/lto/lto-common.c \$(srcdir)/lto/lto-dump.c"
 
 # LTO is a special front end.  From a user's perspective it is not
 # really a language, but a middle end feature.  However, the GIMPLE
diff --git a/gcc/lto/lang.opt b/gcc/lto/lang.opt
index 4c4c1ced38c..5bacef349e3 100644
--- a/gcc/lto/lang.opt
+++ b/gcc/lto/lang.opt
@@ -24,6 +24,9 @@
 Language
 LTO
 
+Language
+LTODump
+
 Enum
 Name(lto_linker_output) Type(enum lto_linker_output) UnknownError(unknown linker output %qs)
 
@@ -66,6 +69,65 @@ fwpa=
 LTO Driver RejectNegative Joined Var(flag_wpa)
 Whole program analysis (WPA) mode with number of parallel jobs specified.
 
+
+list
+LTODump Var(flag_lto_dump_list)
+Call the dump function for variables and function in IL.
+
+demangle
+LTODump Var(flag_lto_dump_demangle)
+Dump the demangled output.
+
+defined-only
+LTODump Var(flag_lto_dump_defined)
+Dump only the defined symbols.
+
+print-value
+LTODump Var(flag_lto_print_value)
+Print the initial values of the variables.
+
+name-sort
+LTODump Var(flag_lto_name_sort)
+Sort the symbols alphabetically.
+
+size-sort
+LTODump Var(flag_lto_size_sort)
+Sort the symbols according to size.
+
+reverse-sort
+LTODump Var(flag_lto_reverse_sort)
+Display the symbols in reverse order.
+
+symbol=
+LTODump RejectNegative Joined Var(flag_lto_dump_symbol)
+
+objects
+LTODump Var(flag_lto_dump_objects)
+Dump the details of LTO objects.
+
+type-stats
+LTODump Var(flag_lto_dump_type_stats)
+Dump the statistics of tree types.
+
+tree-stats
+LTODump Var(flag_lto_tree_stats)
+Dump the statistics of trees.
+
+gimple-stats
+LTODump Var(flag_lto_gimple_stats)
+Dump the statistics of gimple statements.
+
+dump-level=
+LTODump RejectNegative Joined Var(flag_dump_level)
+
+dump-body=
+LTODump RejectNegative Joined Var(flag_dump_body)
+
+help
+LTODump Var(flag_lto_dump_tool_help)
+Dump the dump tool command line options.
+
+
 fresolution=
 LTO Joined
 The resolution file.
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 9d5b034729e..01470c17080 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -1681,6 +1681,10 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
   /* We do not uniquify the pre-loaded cache entries, those are middle-end
      internal types that should not be merged.  */
 
+  typedef int_hash<unsigned, 0, UINT_MAX> code_id_hash;
+  hash_map <code_id_hash, unsigned> hm;
+  unsigned total = 0;
+
   /* Read the global declarations and types.  */
   while (ib_main.p < ib_main.len)
     {
@@ -1730,6 +1734,15 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
 		 chains.  */
 	      if (TYPE_P (t))
 		{
+		  /* Map the tree types to their frequencies.  */
+		  if (flag_lto_dump_type_stats)
+		    {
+		      unsigned key = (unsigned) TREE_CODE (t);
+		      unsigned *countp = hm.get (key);
+		      hm.put (key, countp ? (*countp) + 1 : 1);
+		      total++;
+		    }
+
 		  seen_type = true;
 		  num_prevailing_types++;
 		  lto_fixup_prevailing_type (t);
@@ -1775,6 +1788,22 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
 	  gcc_assert (t && data_in->reader_cache->nodes.length () == from);
 	}
     }
+
+  /* Dump type statistics.  */
+  if (flag_lto_dump_type_stats)
+    {
+      fprintf (stdout, "       Type     Frequency   Percentage\n\n");
+      for (hash_map<code_id_hash, unsigned>::iterator itr = hm.begin ();
+	   itr != hm.end ();
+	   ++itr)
+	{
+	  std::pair<unsigned, unsigned> p = *itr;
+	  enum tree_code code = (enum tree_code) p.first;
+	  fprintf (stdout, "%14s %6d %12.2f\n", get_tree_code_name (code),
+		   p.second, float (p.second)/total*100);
+	}
+    }
+
   data_in->location_cache.apply_location_cache ();
 
   /* Read in lto_in_decl_state objects.  */
@@ -2074,6 +2103,17 @@ lto_file_read (lto_file *file, FILE *resolution_file, int *count)
   memset (&section_list, 0, sizeof (struct lto_section_list)); 
   section_hash_table = lto_obj_build_section_table (file, &section_list);
 
+  /* Dump the details of LTO objects.  */
+  if (flag_lto_dump_objects)
+  {
+    int i=0;
+    fprintf (stdout, "\n    LTO Object Name: %s\n", file->filename);
+    fprintf (stdout, "\nNo.    Offset    Size       Section Name\n\n");
+    for (section = section_list.first; section != NULL; section = section->next)
+      fprintf (stdout, "%2d %8ld %8ld   %s\n",
+	       ++i, section->start, section->len, section->name);
+  }
+
   /* Find all sub modules in the object and put their sections into new hash
      tables in a splay tree. */
   file_ids = lto_splay_tree_new ();
diff --git a/gcc/lto/lto-dump.c b/gcc/lto/lto-dump.c
new file mode 100644
index 00000000000..646b66ed655
--- /dev/null
+++ b/gcc/lto/lto-dump.c
@@ -0,0 +1,344 @@
+/* Functions for LTO dump tool.
+   Copyright (C) 2018-2019 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "function.h"
+#include "basic-block.h"
+#include "tree.h"
+#include "gimple.h"
+#include "cfg.h"
+#include "tree-cfg.h"
+#include "tree-pass.h"
+#include "tree-streamer.h"
+#include "cgraph.h"
+#include "opts.h"
+#include "debug.h"
+#include "lto-partition.h"
+#include "tree-pretty-print.h"
+#include "lto-common.h"
+
+/* Stores details of symbols for dumping symbol list.  */
+
+struct symbol_entry
+{
+  symtab_node *node;
+  symbol_entry (symtab_node *node_): node (node_)
+  {}
+
+  char* get_name () const
+  {
+    if (flag_lto_dump_demangle)
+      return xstrdup (node->name ());
+    else
+      return xstrdup (node->asm_name ());
+  }
+
+  virtual size_t get_size () const = 0;
+
+  virtual void dump ()
+  {
+    const char *name = get_name ();
+    const char *type_name = node->dump_type_name ();
+    const char *visibility = node->dump_visibility ();
+    size_t sz = get_size ();
+    printf ("%s  %s  %4lu  %s  ", type_name, visibility, sz, name);
+  }
+};
+
+/* Stores variable specific details of symbols for dumping symbol list.  */
+
+struct variable_entry: public symbol_entry
+{
+  variable_entry (varpool_node *node_): symbol_entry (node_)
+  {}
+
+  virtual size_t get_size () const
+  {
+    varpool_node *vnode = dyn_cast<varpool_node *> (node);
+    if (DECL_SIZE (vnode->decl) && tree_fits_shwi_p (DECL_SIZE (vnode->decl)))
+      return tree_to_shwi (DECL_SIZE (vnode->decl));
+    return 0;
+  }
+
+  virtual void dump ()
+  {
+    symbol_entry :: dump ();
+    varpool_node *vnode = dyn_cast<varpool_node *> (node);
+    vnode->get_constructor ();
+    tree value_tree = DECL_INITIAL (vnode->decl);
+    if (flag_lto_print_value && value_tree)
+      print_generic_expr (stdout, value_tree, TDF_NONE);
+    printf ("\n");
+  }
+};
+
+/* Stores function specific details of symbols for dumping symbol list.  */
+
+struct function_entry: public symbol_entry
+{
+  function_entry (cgraph_node *node_): symbol_entry (node_)
+  {}
+
+  virtual void dump ()
+  {
+    symbol_entry :: dump ();
+    printf ("\n");
+  }
+
+  virtual size_t get_size () const
+  {
+    cgraph_node *cnode = dyn_cast<cgraph_node *> (node);
+    gcc_assert (cnode);
+
+    return (cnode->definition)
+     ? n_basic_blocks_for_fn (DECL_STRUCT_FUNCTION (cnode->decl))
+     : 0;
+  }
+};
+
+/* Comparing symbols based on size.  */
+
+int size_compare (const void *a, const void *b)
+{
+  const symbol_entry *e1 = *(const symbol_entry * const*) a;
+  const symbol_entry *e2 = *(const symbol_entry * const*) b;
+
+  return e1->get_size () - e2->get_size ();
+}
+
+/* Comparing symbols based on name.  */
+
+int name_compare (const void *a, const void *b)
+{
+  const symbol_entry *e1 = *(const symbol_entry * const*) a;
+  const symbol_entry *e2 = *(const symbol_entry * const*) b;
+
+  return strcmp (e1->get_name (), e2->get_name ());
+}
+
+/* Dump list of functions and their details.  */
+
+void dump_list_functions (void)
+{
+  auto_vec<symbol_entry *> v;
+
+  cgraph_node *cnode;
+  FOR_EACH_FUNCTION (cnode)
+  {
+    if (cnode->definition)
+      cnode->get_untransformed_body ();
+    symbol_entry *e = new function_entry (cnode);
+    if (!flag_lto_dump_defined || cnode->definition)
+      v.safe_push (e);
+  }
+
+  if (flag_lto_size_sort)
+    v.qsort (size_compare);
+  else if (flag_lto_name_sort)
+    v.qsort (name_compare);
+  if (flag_lto_reverse_sort)
+    v.reverse ();
+
+  printf ("Type   Visibility  Size  Name");
+  if (flag_lto_print_value)
+    printf ("  Value");
+  printf ("\n");
+  int i=0;
+  symbol_entry* e;
+  FOR_EACH_VEC_ELT (v, i, e)
+    e->dump ();
+}
+
+/* Dump list of variables and their details.  */
+
+void dump_list_variables (void)
+{
+  auto_vec<symbol_entry *> v;
+
+  varpool_node *vnode;
+  FOR_EACH_VARIABLE (vnode)
+  {
+    symbol_entry *e = new variable_entry (vnode);
+    if (!flag_lto_dump_defined || vnode->definition)
+      v.safe_push (e);
+  }
+
+  if (flag_lto_size_sort)
+    v.qsort (size_compare);
+  else if (flag_lto_name_sort)
+    v.qsort (name_compare);
+  if (flag_lto_reverse_sort)
+    v.reverse ();
+
+  printf ("\n");
+  int i=0;
+  symbol_entry* e;
+  FOR_EACH_VEC_ELT (v, i, e)
+    e->dump ();
+}
+
+/* Dump symbol list.  */
+
+void dump_list (void)
+{
+  dump_list_functions ();
+  dump_list_variables ();
+  return;
+}
+
+/* Dump specific variables and functions used in IL.  */
+void dump_symbol ()
+{
+  symtab_node *node;
+  printf ("Symbol: %s\n", flag_lto_dump_symbol);
+  FOR_EACH_SYMBOL (node)
+    {
+      if (!strcmp (flag_lto_dump_symbol, node->name ()))
+	{
+	  node->debug ();
+	  printf ("\n");
+	}
+    }
+  return;
+}
+
+/* Dump specific gimple body of specified function.  */
+void dump_body ()
+{
+  int flag = 0;
+  dump_flags_t flags = TDF_NONE;
+  if (flag_dump_level)
+    flags = parse_dump_option (flag_dump_level, NULL);
+  if (flags == TDF_ERROR)
+  {
+    error_at (input_location, "Level not found, use none, slim, blocks, vops.");
+    return;
+  }
+  cgraph_node *cnode;
+  FOR_EACH_FUNCTION (cnode)
+  if (cnode->definition && !strcmp (cnode->name (), flag_dump_body))
+  {
+    printf ("Gimple Body of Function: %s\n", cnode->name ());
+    cnode->get_untransformed_body ();
+    debug_function (cnode->decl, flags);
+    flag = 1;
+  }
+  if (!flag)
+    error_at (input_location, "Function not found.");
+  return;
+}
+
+/* List of command line options for dumping.  */
+void dump_tool_help ()
+{
+  printf ("Usage: lto-dump [OPTION]... SUB_COMMAND [OPTION]...\n\n");
+  printf ("LTO dump tool command line options.\n\n");
+  printf ("  -list [options]           Dump the symbol list.\n");
+  printf ("    -demangle               Dump the demangled output.\n");
+  printf ("    -defined-only           Dump only the defined symbols.\n");
+  printf ("    -print-value            Dump initial values of the "
+	  "variables.\n");
+  printf ("    -name-sort              Sort the symbols alphabetically.\n");
+  printf ("    -size-sort              Sort the symbols according to size.\n");
+  printf ("    -reverse-sort           Dump the symbols in reverse order.\n");
+  printf ("  -symbol=                  Dump the details of specific symbol.\n");
+  printf ("  -objects                  Dump the details of LTO objects.\n");
+  printf ("  -type-stats               Dump statistics of tree types.\n");
+  printf ("  -tree-stats               Dump statistics of trees.\n");
+  printf ("  -gimple-stats             Dump statistics of gimple "
+	  "statements.\n");
+  printf ("  -dump-body=               Dump the specific gimple body.\n");
+  printf ("  -dump-level=              Deciding the optimization level "
+	  "of body.\n");
+  printf ("  -help                     Display the dump tool help.\n");
+  return;
+}
+
+unsigned int
+lto_option_lang_mask (void)
+{
+  return CL_LTODump;
+}
+
+/* Functions for dumping various details in LTO dump tool are called
+   in lto_main(). The purpose of this dump tool is to analyze the LTO
+   object files.  */
+
+void
+lto_main (void)
+{
+  quiet_flag = true;
+  if (flag_lto_dump_tool_help)
+    dump_tool_help ();
+
+  /* LTO is called as a front end, even though it is not a front end.
+     Because it is called as a front end, TV_PHASE_PARSING and
+     TV_PARSE_GLOBAL are active, and we need to turn them off while
+     doing LTO.  Later we turn them back on so they are active up in
+     toplev.c.  */
+
+  /* Initialize the LTO front end.  */
+  lto_fe_init ();
+  g_timer = NULL;
+  /* Read all the symbols and call graph from all the files in the
+     command line.  */
+  read_cgraph_and_symbols (num_in_fnames, in_fnames);
+
+  /* Dump symbol list.  */
+  if (flag_lto_dump_list)
+    dump_list ();
+  else if (flag_lto_dump_symbol)
+    {
+      /* Dump specific variables and functions used in IL.  */
+      dump_symbol ();
+    }
+  else if (flag_lto_gimple_stats)
+    {
+      /* Dump gimple statement statistics.  */
+      cgraph_node *node;
+      FOR_EACH_DEFINED_FUNCTION (node)
+	node->get_untransformed_body ();
+      if (!GATHER_STATISTICS)
+	warning_at (input_location, 0,
+		    "Not configured with --enable-gather-detailed-mem-stats.");
+      else
+	dump_gimple_statistics ();
+    }
+  else if (flag_lto_tree_stats)
+    {
+      /* Dump tree statistics.  */
+      if (!GATHER_STATISTICS)
+	warning_at (input_location, 0,
+		    "Not configured with --enable-gather-detailed-mem-stats.");
+      else
+	{
+	  printf ("Tree Statistics\n");
+	  dump_tree_statistics ();
+	}
+    }
+  else if (flag_dump_body)
+    {
+      /* Dump specific gimple body of specified function.  */
+      dump_body ();
+      return;
+    }
+}
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index b88ca09d102..e155ea33d32 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -789,12 +789,6 @@ static GTY(()) tree registered_builtin_types;
 
 /* Language hooks.  */
 
-static unsigned int
-lto_option_lang_mask (void)
-{
-  return CL_LTO;
-}
-
 static bool
 lto_complain_wrong_lang_p (const struct cl_option *option ATTRIBUTE_UNUSED)
 {
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 55d5554f18e..26b8c172312 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -535,6 +535,12 @@ offload_handle_link_vars (void)
 #endif
 }
 
+unsigned int
+lto_option_lang_mask (void)
+{
+  return CL_LTO;
+}
+
 /* Main entry point for the GIMPLE front end.  This front end has
    three main personalities:
 
diff --git a/gcc/lto/lto.h b/gcc/lto/lto.h
index a1b39ef8ff0..e67e1e76d40 100644
--- a/gcc/lto/lto.h
+++ b/gcc/lto/lto.h
@@ -69,4 +69,6 @@ struct lto_section_list
   struct lto_section_slot *first, *last;
 };
 
+extern unsigned int lto_option_lang_mask (void);
+
 #endif /* LTO_H */
diff --git a/gcc/symtab.c b/gcc/symtab.c
index c3c057d3283..04fbf762ecd 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -808,6 +808,23 @@ symtab_node::dump_referring (FILE *file)
 
 static const char * const symtab_type_names[] = {"symbol", "function", "variable"};
 
+/* Dump the visibility of the symbol.  */
+
+const char *
+symtab_node::dump_visibility () const
+{
+  static const char * const visibility_types[]
+    = { "default", "protected", "hidden", "internal" };
+  return visibility_types[DECL_VISIBILITY (decl)];
+}
+
+/* Dump the type_name of the symbol.  */
+const char *
+symtab_node::dump_type_name () const
+{
+  return symtab_type_names[type];
+}
+
 /* Dump base fields of symtab nodes to F.  Not to be used directly.  */
 
 void

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 0/3][stage1] [PATCH v2] LTO dump tool
@ 2019-03-14 14:00 marxin
  2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: marxin @ 2019-03-14 14:00 UTC (permalink / raw)
  To: gcc-patches; +Cc: hrishikeshparag, hubicka

Hi.

The patch series is a remake of Hrishikesh's LTO dump tool that was
part of GSoC last year. I decided to split the patch into 3 parts, where
the first one is purely mechanical splitting code into a newly created
one. The second part introduces the new tool. And the last one is about
GNU coding style fixes.

Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed after stage1 opens?

Thanks,
Martin

marxin (3):
  Split part of functionality from lto.c to lto-common.c.
  Add lto-dump tool.
  Fix GNU coding style in lto-common.c.

 gcc/Makefile.in        |    2 +-
 gcc/cgraph.h           |    6 +
 gcc/doc/gcc.texi       |    5 +
 gcc/doc/lto-dump.texi  |  131 ++
 gcc/dumpfile.c         |   85 +-
 gcc/dumpfile.h         |    5 +
 gcc/lto/Make-lang.in   |   22 +-
 gcc/lto/config-lang.in |    4 +-
 gcc/lto/lang.opt       |   62 +
 gcc/lto/lto-common.c   | 2883 ++++++++++++++++++++++++++++++++++++++++
 gcc/lto/lto-common.h   |   33 +
 gcc/lto/lto-dump.c     |  344 +++++
 gcc/lto/lto-lang.c     |    7 +-
 gcc/lto/lto.c          | 2869 +--------------------------------------
 gcc/lto/lto.h          |    2 +
 gcc/symtab.c           |   17 +
 16 files changed, 3612 insertions(+), 2865 deletions(-)
 create mode 100644 gcc/doc/lto-dump.texi
 create mode 100644 gcc/lto/lto-common.c
 create mode 100644 gcc/lto/lto-common.h
 create mode 100644 gcc/lto/lto-dump.c

-- 
2.21.0

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 3/3] Fix GNU coding style in lto-common.c.
  2019-03-14 14:00 [PATCH 0/3][stage1] [PATCH v2] LTO dump tool marxin
  2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
@ 2019-03-14 14:00 ` marxin
  2019-04-29 19:43   ` Jeff Law
  2019-03-14 14:06 ` [PATCH 1/3] Split part of functionality from lto.c to lto-common.c marxin
  2 siblings, 1 reply; 9+ messages in thread
From: marxin @ 2019-03-14 14:00 UTC (permalink / raw)
  To: gcc-patches; +Cc: hrishikeshparag, hubicka

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]


gcc/lto/ChangeLog:

2019-03-14  Martin Liska  <mliska@suse.cz>

	* lto-common.c: Update coding style.
	* lto.c (materialize_cgraph): Likewise.
---
 gcc/lto/lto-common.c | 214 ++++++++++++++++++++++---------------------
 gcc/lto/lto.c        |  30 +++---
 2 files changed, 128 insertions(+), 116 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-Fix-GNU-coding-style-in-lto-common.c.patch --]
[-- Type: text/x-patch; name="0003-Fix-GNU-coding-style-in-lto-common.c.patch", Size: 26300 bytes --]

diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 01470c17080..aa64d8b779e 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -76,15 +76,15 @@ hash_name (const void *p)
 static int
 eq_name (const void *p1, const void *p2)
 {
-  const struct lto_section_slot *s1 =
-    (const struct lto_section_slot *) p1;
-  const struct lto_section_slot *s2 =
-    (const struct lto_section_slot *) p2;
+  const struct lto_section_slot *s1
+    = (const struct lto_section_slot *) p1;
+  const struct lto_section_slot *s2
+    = (const struct lto_section_slot *) p2;
 
   return strcmp (s1->name, s2->name) == 0;
 }
 
-/* Free lto_section_slot */
+/* Free lto_section_slot.  */
 
 static void
 free_with_string (void *arg)
@@ -95,9 +95,9 @@ free_with_string (void *arg)
   free (arg);
 }
 
-/* Create section hash table */
+/* Create section hash table.  */
 
-htab_t 
+htab_t
 lto_obj_create_section_hash_table (void)
 {
   return htab_create (37, hash_name, eq_name, free_with_string);
@@ -145,9 +145,9 @@ lto_splay_tree_id_equal_p (splay_tree_key key, unsigned HOST_WIDE_INT id)
   return *(unsigned HOST_WIDE_INT *) key == id;
 }
 
-/* Insert a splay tree node into tree T with ID as key and FILE_DATA as value. 
+/* Insert a splay tree node into tree T with ID as key and FILE_DATA as value.
    The ID is allocated separately because we need HOST_WIDE_INTs which may
-   be wider than a splay_tree_key. */
+   be wider than a splay_tree_key.  */
 
 static void
 lto_splay_tree_insert (splay_tree t, unsigned HOST_WIDE_INT id,
@@ -164,13 +164,13 @@ static splay_tree
 lto_splay_tree_new (void)
 {
   return splay_tree_new (lto_splay_tree_compare_ids,
-	 	         lto_splay_tree_delete_id,
+			 lto_splay_tree_delete_id,
 			 NULL);
 }
 
 /* Decode the content of memory pointed to by DATA in the in decl
-   state object STATE. DATA_IN points to a data_in structure for
-   decoding. Return the address after the decoded object in the
+   state object STATE.  DATA_IN points to a data_in structure for
+   decoding.  Return the address after the decoded object in the
    input.  */
 
 static const uint32_t *
@@ -255,7 +255,7 @@ hash_canonical_type (tree type)
     {
       hstate.add_int (TYPE_PRECISION (type));
       if (!type_with_interoperable_signedness (type))
-        hstate.add_int (TYPE_UNSIGNED (type));
+	hstate.add_int (TYPE_UNSIGNED (type));
     }
 
   if (VECTOR_TYPE_P (type))
@@ -437,8 +437,8 @@ gimple_register_canonical_type (tree t)
     TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
   else
     {
-      gimple_register_canonical_type_1 (TYPE_MAIN_VARIANT (t),
-					hash_canonical_type (TYPE_MAIN_VARIANT (t)));
+      hashval_t h = hash_canonical_type (TYPE_MAIN_VARIANT (t));
+      gimple_register_canonical_type_1 (TYPE_MAIN_VARIANT (t), h);
       TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
     }
 }
@@ -460,7 +460,7 @@ lto_register_canonical_types (tree node, bool first_p)
       || TREE_CODE (node) == ARRAY_TYPE)
     lto_register_canonical_types (TREE_TYPE (node), first_p);
 
- if (!first_p) 
+ if (!first_p)
     gimple_register_canonical_type (node);
 }
 
@@ -534,7 +534,7 @@ mentions_vars_p_decl_with_vis (tree t)
   if (mentions_vars_p_decl_common (t))
     return true;
 
-  /* Accessor macro has side-effects, use field-name here. */
+  /* Accessor macro has side-effects, use field-name here.  */
   CHECK_NO_VAR (DECL_ASSEMBLER_NAME_RAW (t));
   return false;
 }
@@ -594,7 +594,7 @@ mentions_vars_p_type (tree t)
   CHECK_VAR (TYPE_MIN_VALUE_RAW (t));
   CHECK_VAR (TYPE_MAX_VALUE_RAW (t));
 
-  /* Accessor is for derived node types only. */
+  /* Accessor is for derived node types only.  */
   CHECK_NO_VAR (TYPE_LANG_SLOT_1 (t));
 
   CHECK_VAR (TYPE_CONTEXT (t));
@@ -748,7 +748,7 @@ mentions_vars_p (tree t)
 }
 
 
-/* Return the resolution for the decl with index INDEX from DATA_IN. */
+/* Return the resolution for the decl with index INDEX from DATA_IN.  */
 
 static enum ld_plugin_symbol_resolution
 get_resolution (struct data_in *data_in, unsigned index)
@@ -758,7 +758,7 @@ get_resolution (struct data_in *data_in, unsigned index)
       ld_plugin_symbol_resolution_t ret;
       /* We can have references to not emitted functions in
 	 DECL_FUNCTION_PERSONALITY at least.  So we can and have
-	 to indeed return LDPR_UNKNOWN in some cases.   */
+	 to indeed return LDPR_UNKNOWN in some cases.  */
       if (data_in->globals_resolution.length () <= index)
 	return LDPR_UNKNOWN;
       ret = data_in->globals_resolution[index];
@@ -1090,7 +1090,7 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
       if (code == VAR_DECL)
 	{
 	  compare_values (DECL_HARD_REGISTER);
-          /* DECL_IN_TEXT_SECTION is set during final asm output only.  */
+	  /* DECL_IN_TEXT_SECTION is set during final asm output only.  */
 	  compare_values (DECL_IN_CONSTANT_POOL);
 	}
     }
@@ -1143,8 +1143,8 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
       compare_values (TYPE_PRECISION);
       compare_values (TYPE_ALIGN);
       /* Do not compare TYPE_ALIAS_SET.  Doing so introduce ordering issues
-         with calls to get_alias_set which may initialize it for streamed
- 	 in types.  */
+	 with calls to get_alias_set which may initialize it for streamed
+	 in types.  */
     }
 
   /* We don't want to compare locations, so there is nothing do compare
@@ -1479,7 +1479,7 @@ compare_tree_sccs (tree_scc *pscc, tree_scc *scc,
 	  return true;
 	}
       /* Reset TREE_ASM_WRITTEN on scc for the next compare or in case
-         the SCC prevails.  */
+	 the SCC prevails.  */
       for (unsigned j = 0; j < scc->len; ++j)
 	TREE_ASM_WRITTEN (scc->entries[j]) = 0;
     }
@@ -1582,7 +1582,7 @@ unify_scc (struct data_in *data_in, unsigned from,
 	  if (len == 1)
 	    {
 	      /* If we got a debug reference queued, see if the prevailing
-	         tree has a debug reference and if not, register the one
+		 tree has a debug reference and if not, register the one
 		 for the tree we are about to throw away.  */
 	      if (dref_queue.length () == 1)
 		{
@@ -1807,19 +1807,19 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
   data_in->location_cache.apply_location_cache ();
 
   /* Read in lto_in_decl_state objects.  */
-  data_ptr = (const uint32_t *) ((const char*) data + decl_offset); 
-  data_end =
-     (const uint32_t *) ((const char*) data_ptr + header->decl_state_size);
+  data_ptr = (const uint32_t *) ((const char*) data + decl_offset);
+  data_end
+    = (const uint32_t *) ((const char*) data_ptr + header->decl_state_size);
   num_decl_states = *data_ptr++;
-  
+
   gcc_assert (num_decl_states > 0);
   decl_data->global_decl_state = lto_new_in_decl_state ();
   data_ptr = lto_read_in_decl_state (data_in, data_ptr,
 				     decl_data->global_decl_state);
 
   /* Read in per-function decl states and enter them in hash table.  */
-  decl_data->function_decl_states =
-    hash_table<decl_state_hasher>::create_ggc (37);
+  decl_data->function_decl_states
+    = hash_table<decl_state_hasher>::create_ggc (37);
 
   for (i = 1; i < num_decl_states; i++)
     {
@@ -1835,7 +1835,7 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
   if (data_ptr != data_end)
     internal_error ("bytecode stream: garbage at the end of symbols section");
 
-  /* Set the current decl state to be the global state. */
+  /* Set the current decl state to be the global state.  */
   decl_data->current_decl_state = decl_data->global_decl_state;
 
   lto_data_in_delete (data_in);
@@ -1854,40 +1854,40 @@ lto_parse_hex (const char *p)
       unsigned char part;
       ret <<= 4;
       if (c >= '0' && c <= '9')
-        part = c - '0';
+	part = c - '0';
       else if (c >= 'a' && c <= 'f')
-        part = c - 'a' + 10;
+	part = c - 'a' + 10;
       else if (c >= 'A' && c <= 'F')
-        part = c - 'A' + 10;
+	part = c - 'A' + 10;
       else
-        internal_error ("could not parse hex number");
+	internal_error ("could not parse hex number");
       ret |= part;
     }
 
   return ret;
 }
 
-/* Read resolution for file named FILE_NAME. The resolution is read from
-   RESOLUTION. */
+/* Read resolution for file named FILE_NAME.  The resolution is read from
+   RESOLUTION.  */
 
 static void
 lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
 {
   /* We require that objects in the resolution file are in the same
-     order as the lto1 command line. */
+     order as the lto1 command line.  */
   unsigned int name_len;
   char *obj_name;
   unsigned int num_symbols;
   unsigned int i;
   struct lto_file_decl_data *file_data;
-  splay_tree_node nd = NULL; 
+  splay_tree_node nd = NULL;
 
   if (!resolution)
     return;
 
   name_len = strlen (file->filename);
   obj_name = XNEWVEC (char, name_len + 1);
-  fscanf (resolution, " ");   /* Read white space. */
+  fscanf (resolution, " ");   /* Read white space.  */
 
   fread (obj_name, sizeof (char), name_len, resolution);
   obj_name[name_len] = '\0';
@@ -1901,10 +1901,10 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
       int64_t offset;
       t = fscanf (resolution, "@0x%16s", offset_p);
       if (t != 1)
-        internal_error ("could not parse file offset");
+	internal_error ("could not parse file offset");
       offset = lto_parse_hex (offset_p);
       if (offset != file->offset)
-        internal_error ("unexpected offset");
+	internal_error ("unexpected offset");
     }
 
   free (obj_name);
@@ -1919,14 +1919,14 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
       char r_str[27];
       enum ld_plugin_symbol_resolution r = (enum ld_plugin_symbol_resolution) 0;
       unsigned int j;
-      unsigned int lto_resolution_str_len =
-	sizeof (lto_resolution_str) / sizeof (char *);
+      unsigned int lto_resolution_str_len
+	= sizeof (lto_resolution_str) / sizeof (char *);
       res_pair rp;
 
-      t = fscanf (resolution, "%u " HOST_WIDE_INT_PRINT_HEX_PURE " %26s %*[^\n]\n", 
-		  &index, &id, r_str);
+      t = fscanf (resolution, "%u " HOST_WIDE_INT_PRINT_HEX_PURE
+		  " %26s %*[^\n]\n", &index, &id, r_str);
       if (t != 3)
-        internal_error ("invalid line in the resolution file");
+	internal_error ("invalid line in the resolution file");
 
       for (j = 0; j < lto_resolution_str_len; j++)
 	{
@@ -1947,25 +1947,25 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
 	}
 
       file_data = (struct lto_file_decl_data *)nd->value;
-      /* The indexes are very sparse. To save memory save them in a compact
-         format that is only unpacked later when the subfile is processed. */
+      /* The indexes are very sparse.  To save memory save them in a compact
+	 format that is only unpacked later when the subfile is processed.  */
       rp.res = r;
       rp.index = index;
       file_data->respairs.safe_push (rp);
       if (file_data->max_index < index)
-        file_data->max_index = index;
+	file_data->max_index = index;
     }
 }
 
-/* List of file_decl_datas */
+/* List of file_decl_datas.  */
 struct file_data_list
-  {
-    struct lto_file_decl_data *first, *last;
-  };
+{
+  struct lto_file_decl_data *first, *last;
+};
 
 /* Is the name for a id'ed LTO section? */
 
-static int 
+static int
 lto_section_with_id (const char *name, unsigned HOST_WIDE_INT *id)
 {
   const char *s;
@@ -1981,11 +1981,11 @@ lto_section_with_id (const char *name, unsigned HOST_WIDE_INT *id)
   return sscanf (s, "." HOST_WIDE_INT_PRINT_HEX_PURE, id) == 1;
 }
 
-/* Create file_data of each sub file id */
+/* Create file_data of each sub file id.  */
 
-static int 
+static int
 create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
-                            struct file_data_list *list)
+			    struct file_data_list *list)
 {
   struct lto_section_slot s_slot, *new_slot;
   unsigned HOST_WIDE_INT id;
@@ -1996,8 +1996,8 @@ create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
 
   if (!lto_section_with_id (ls->name, &id))
     return 1;
-  
-  /* Find hash table of sub module id */
+
+  /* Find hash table of sub module id.  */
   nd = lto_splay_tree_lookup (file_ids, id);
   if (nd != NULL)
     {
@@ -2011,15 +2011,16 @@ create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
       file_data->section_hash_table = lto_obj_create_section_hash_table ();
       lto_splay_tree_insert (file_ids, id, file_data);
 
-      /* Maintain list in linker order */
+      /* Maintain list in linker order.  */
       if (!list->first)
-        list->first = file_data;
+	list->first = file_data;
       if (list->last)
-        list->last->next = file_data;
+	list->last->next = file_data;
+
       list->last = file_data;
     }
 
-  /* Copy section into sub module hash table */
+  /* Copy section into sub module hash table.  */
   new_name = XDUPVEC (char, ls->name, strlen (ls->name) + 1);
   s_slot.name = new_name;
   hash_slot = htab_find_slot (file_data->section_hash_table, &s_slot, INSERT);
@@ -2031,7 +2032,7 @@ create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
   return 1;
 }
 
-/* Read declarations and other initializations for a FILE_DATA. */
+/* Read declarations and other initializations for a FILE_DATA.  */
 
 static void
 lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
@@ -2043,8 +2044,8 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
   int i;
   res_pair *rp;
 
-  /* Create vector for fast access of resolution. We do this lazily
-     to save memory. */ 
+  /* Create vector for fast access of resolution.  We do this lazily
+     to save memory.  */
   resolutions.safe_grow_cleared (file_data->max_index + 1);
   for (i = 0; file_data->respairs.iterate (i, &rp); i++)
     resolutions[rp->index] = rp->res;
@@ -2063,14 +2064,14 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
       internal_error ("cannot read LTO decls from %s", file_data->file_name);
       return;
     }
-  /* Frees resolutions */
+  /* Frees resolutions.  */
   lto_read_decls (file_data, data, resolutions);
   lto_free_section_data (file_data, LTO_section_decls, NULL, data, len);
 }
 
-/* Finalize FILE_DATA in FILE and increase COUNT. */
+/* Finalize FILE_DATA in FILE and increase COUNT.  */
 
-static int 
+static int
 lto_create_files_from_ids (lto_file *file, struct lto_file_decl_data *file_data,
 			   int *count)
 {
@@ -2084,11 +2085,11 @@ lto_create_files_from_ids (lto_file *file, struct lto_file_decl_data *file_data,
 }
 
 /* Generate a TREE representation for all types and external decls
-   entities in FILE.  
+   entities in FILE.
 
    Read all of the globals out of the file.  Then read the cgraph
    and process the .o index into the cgraph nodes so that it can open
-   the .o file to load the functions and ipa information.   */
+   the .o file to load the functions and ipa information.  */
 
 static struct lto_file_decl_data *
 lto_file_read (lto_file *file, FILE *resolution_file, int *count)
@@ -2099,8 +2100,8 @@ lto_file_read (lto_file *file, FILE *resolution_file, int *count)
   struct lto_section_slot *section;
   struct file_data_list file_list;
   struct lto_section_list section_list;
- 
-  memset (&section_list, 0, sizeof (struct lto_section_list)); 
+
+  memset (&section_list, 0, sizeof (struct lto_section_list));
   section_hash_table = lto_obj_build_section_table (file, &section_list);
 
   /* Dump the details of LTO objects.  */
@@ -2115,19 +2116,20 @@ lto_file_read (lto_file *file, FILE *resolution_file, int *count)
   }
 
   /* Find all sub modules in the object and put their sections into new hash
-     tables in a splay tree. */
+     tables in a splay tree.  */
   file_ids = lto_splay_tree_new ();
   memset (&file_list, 0, sizeof (struct file_data_list));
   for (section = section_list.first; section != NULL; section = section->next)
     create_subid_section_table (section, file_ids, &file_list);
 
-  /* Add resolutions to file ids */
+  /* Add resolutions to file ids.  */
   lto_resolution_read (file_ids, resolution_file, file);
 
-  /* Finalize each lto file for each submodule in the merged object */
-  for (file_data = file_list.first; file_data != NULL; file_data = file_data->next)
+  /* Finalize each lto file for each submodule in the merged object.  */
+  for (file_data = file_list.first; file_data != NULL;
+       file_data = file_data->next)
     lto_create_files_from_ids (file, file_data, count);
- 
+
   splay_tree_delete (file_ids);
   htab_delete (section_hash_table);
 
@@ -2176,10 +2178,10 @@ lto_read_section_data (struct lto_file_decl_data *file_data,
     {
       fd = open (file_data->file_name, O_RDONLY|O_BINARY);
       if (fd == -1)
-        {
+	{
 	  fatal_error (input_location, "Cannot open %s", file_data->file_name);
 	  return NULL;
-        }
+	}
       fd_name = xstrdup (file_data->file_name);
     }
 
@@ -2213,8 +2215,8 @@ lto_read_section_data (struct lto_file_decl_data *file_data,
       result = NULL;
     }
 #ifdef __MINGW32__
-  /* Native windows doesn't supports delayed unlink on opened file. So
-     we close file here again. This produces higher I/O load, but at least
+  /* Native windows doesn't supports delayed unlink on opened file.  So
+     we close file here again.  This produces higher I/O load, but at least
      it prevents to have dangling file handles preventing unlink.  */
   free (fd_name);
   fd_name = NULL;
@@ -2223,7 +2225,7 @@ lto_read_section_data (struct lto_file_decl_data *file_data,
 #endif
   return result;
 #endif
-}    
+}
 
 
 /* Get the section data from FILE_DATA of SECTION_TYPE with NAME.
@@ -2239,7 +2241,8 @@ get_section_data (struct lto_file_decl_data *file_data,
   htab_t section_hash_table = file_data->section_hash_table;
   struct lto_section_slot *f_slot;
   struct lto_section_slot s_slot;
-  const char *section_name = lto_get_section_name (section_type, name, file_data);
+  const char *section_name = lto_get_section_name (section_type, name,
+						   file_data);
   char *data = NULL;
 
   *len = 0;
@@ -2291,7 +2294,7 @@ static lto_file *current_lto_file;
     if ((tt) && VAR_OR_FUNCTION_DECL_P (tt) \
 	&& (TREE_PUBLIC (tt) || DECL_EXTERNAL (tt))) \
       { \
-        tt = lto_symtab_prevailing_decl (tt); \
+	tt = lto_symtab_prevailing_decl (tt); \
 	fixed = true; \
       } \
   } while (0)
@@ -2312,7 +2315,7 @@ lto_fixup_prevailing_decls (tree t)
   LTO_NO_PREVAIL (TREE_TYPE (t));
   if (CODE_CONTAINS_STRUCT (code, TS_COMMON)
       /* lto_symtab_prevail_decl use TREE_CHAIN to link to the prevailing decl.
-	 in the case T is a prevailed declaration we would ICE here. */
+	 in the case T is a prevailed declaration we would ICE here.  */
       && !VAR_OR_FUNCTION_DECL_P (t))
     LTO_NO_PREVAIL (TREE_CHAIN (t));
   if (DECL_P (t))
@@ -2401,7 +2404,7 @@ lto_fixup_prevailing_decls (tree t)
 #undef LTO_SET_PREVAIL
 #undef LTO_NO_PREVAIL
 
-/* Helper function of lto_fixup_decls. Walks the var and fn streams in STATE,
+/* Helper function of lto_fixup_decls.  Walks the var and fn streams in STATE,
    replaces var and function decls with the corresponding prevailing def.  */
 
 static void
@@ -2427,7 +2430,7 @@ lto_fixup_state (struct lto_in_decl_state *state)
     }
 }
 
-/* Fix the decls from all FILES. Replaces each decl with the corresponding
+/* Fix the decls from all FILES.  Replaces each decl with the corresponding
    prevailing one.  */
 
 static void
@@ -2457,10 +2460,11 @@ lto_fixup_decls (struct lto_file_decl_data **files)
 static GTY((length ("lto_stats.num_input_files + 1"))) struct lto_file_decl_data **all_file_decl_data;
 
 /* Turn file datas for sub files into a single array, so that they look
-   like separate files for further passes. */
+   like separate files for further passes.  */
 
 static void
-lto_flatten_files (struct lto_file_decl_data **orig, int count, int last_file_ix)
+lto_flatten_files (struct lto_file_decl_data **orig, int count,
+		   int last_file_ix)
 {
   struct lto_file_decl_data *n, *next;
   int i, k;
@@ -2470,7 +2474,7 @@ lto_flatten_files (struct lto_file_decl_data **orig, int count, int last_file_ix
     = ggc_cleared_vec_alloc<lto_file_decl_data_ptr> (count + 1);
   /* Set the hooks so that all of the ipa passes can read in their data.  */
   lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
-  for (i = 0, k = 0; i < last_file_ix; i++) 
+  for (i = 0, k = 0; i < last_file_ix; i++)
     {
       for (n = orig[i]; n != NULL; n = next)
 	{
@@ -2613,7 +2617,7 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   delete canonical_type_hash_cache;
   canonical_type_hash_cache = NULL;
 
-  /* At this stage we know that majority of GGC memory is reachable.  
+  /* At this stage we know that majority of GGC memory is reachable.
      Growing the limits prevents unnecesary invocation of GGC.  */
   ggc_grow ();
   ggc_collect ();
@@ -2648,19 +2652,19 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
 	  {
 	    if (snode->output_to_lto_symbol_table_p ())
 	      fatal_error (input_location, "missing resolution data for %s",
-		           IDENTIFIER_POINTER
+			   IDENTIFIER_POINTER
 			     (DECL_ASSEMBLER_NAME (snode->decl)));
 	  }
 	else
-          snode->resolution = *res;
+	  snode->resolution = *res;
       }
   for (i = 0; all_file_decl_data[i]; i++)
     if (all_file_decl_data[i]->resolution_map)
       {
-        delete all_file_decl_data[i]->resolution_map;
-        all_file_decl_data[i]->resolution_map = NULL;
+	delete all_file_decl_data[i]->resolution_map;
+	all_file_decl_data[i]->resolution_map = NULL;
       }
-  
+
   timevar_pop (TV_IPA_LTO_CGRAPH_IO);
 
   if (!quiet_flag)
@@ -2706,9 +2710,11 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
       gcc_assert (all_file_decl_data[i]->symtab_node_encoder);
       lto_symtab_encoder_delete (all_file_decl_data[i]->symtab_node_encoder);
       all_file_decl_data[i]->symtab_node_encoder = NULL;
-      lto_free_function_in_decl_state (all_file_decl_data[i]->global_decl_state);
+      lto_in_decl_state *global_decl_state
+	= all_file_decl_data[i]->global_decl_state;
+      lto_free_function_in_decl_state (global_decl_state);
       all_file_decl_data[i]->global_decl_state = NULL;
-      all_file_decl_data[i]->current_decl_state = NULL; 
+      all_file_decl_data[i]->current_decl_state = NULL;
     }
 
   if (!flag_ltrans)
@@ -2732,7 +2738,7 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
       ggc_collect ();
 
       if (dump_file)
-        dump_end (lto_link_dump_id, dump_file);
+	dump_end (lto_link_dump_id, dump_file);
       dump_file = NULL;
       timevar_pop (TV_IPA_LTO_CGRAPH_MERGE);
     }
@@ -2838,9 +2844,9 @@ lto_eh_personality (void)
   return lto_eh_personality_decl;
 }
 
-/* Set the process name based on the LTO mode. */
+/* Set the process name based on the LTO mode.  */
 
-static void 
+static void
 lto_process_name (void)
 {
   if (flag_lto)
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 26b8c172312..4da43e1158b 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -118,7 +118,7 @@ lto_materialize_function (struct cgraph_node *node)
 static void
 materialize_cgraph (void)
 {
-  struct cgraph_node *node; 
+  struct cgraph_node *node;
   timevar_id_t lto_timer;
 
   if (!quiet_flag)
@@ -240,7 +240,7 @@ stream_out (char *temp_filename, lto_symtab_encoder_t encoder,
 	}
       /* Fork failed; lets do the job ourseleves.  */
       else if (cpid == -1)
-        do_stream_out (temp_filename, encoder, part);
+	do_stream_out (temp_filename, encoder, part);
       else
 	nruns++;
     }
@@ -279,7 +279,8 @@ lto_wpa_write_files (void)
   timevar_push (TV_WHOPR_WPA);
 
   FOR_EACH_VEC_ELT (ltrans_partitions, i, part)
-    lto_stats.num_output_symtab_nodes += lto_symtab_encoder_size (part->encoder);
+    lto_stats.num_output_symtab_nodes
+    += lto_symtab_encoder_size (part->encoder);
 
   timevar_pop (TV_WHOPR_WPA);
 
@@ -305,15 +306,18 @@ lto_wpa_write_files (void)
       sprintf (temp_filename + blen, "%u.o", i);
 
       if (!quiet_flag)
-	fprintf (stderr, " %s (%s %i insns)", temp_filename, part->name, part->insns);
+	fprintf (stderr, " %s (%s %i insns)", temp_filename, part->name,
+		 part->insns);
       if (symtab->dump_file)
 	{
-          lto_symtab_encoder_iterator lsei;
-	  
-	  fprintf (symtab->dump_file, "Writing partition %s to file %s, %i insns\n",
+	  lto_symtab_encoder_iterator lsei;
+
+	  fprintf (symtab->dump_file,
+		   "Writing partition %s to file %s, %i insns\n",
 		   part->name, temp_filename, part->insns);
 	  fprintf (symtab->dump_file, "  Symbols in partition: ");
-	  for (lsei = lsei_start_in_partition (part->encoder); !lsei_end_p (lsei);
+	  for (lsei = lsei_start_in_partition (part->encoder);
+	       !lsei_end_p (lsei);
 	       lsei_next_in_partition (&lsei))
 	    {
 	      symtab_node *node = lsei_node (lsei);
@@ -329,13 +333,15 @@ lto_wpa_write_files (void)
 		  fprintf (symtab->dump_file, "%s ", node->asm_name ());
 		  cgraph_node *cnode = dyn_cast <cgraph_node *> (node);
 		  if (cnode
-		      && lto_symtab_encoder_encode_body_p (part->encoder, cnode))
+		      && lto_symtab_encoder_encode_body_p (part->encoder,
+							   cnode))
 		    fprintf (symtab->dump_file, "(body included)");
 		  else
 		    {
 		      varpool_node *vnode = dyn_cast <varpool_node *> (node);
 		      if (vnode
-			  && lto_symtab_encoder_encode_initializer_p (part->encoder, vnode))
+			  && lto_symtab_encoder_encode_initializer_p (part->encoder,
+								      vnode))
 			fprintf (symtab->dump_file, "(initializer included)");
 		    }
 		}
@@ -373,7 +379,7 @@ lto_wpa_write_files (void)
     fatal_error (input_location,
 		 "closing LTRANS output list %s: %m", ltrans_output_list);
 
-  free_ltrans_partitions();
+  free_ltrans_partitions ();
   free (temp_filename);
 
   timevar_pop (TV_WHOPR_WPA_IO);
@@ -609,7 +615,7 @@ lto_main (void)
 	  debuginfo_early_stop ();
 
 	  /* Let the middle end know that we have read and merged all of
-	     the input files.  */ 
+	     the input files.  */
 	  symtab->compile ();
 
 	  timevar_stop (TV_PHASE_OPT_GEN);

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/3] Split part of functionality from lto.c to lto-common.c.
  2019-03-14 14:00 [PATCH 0/3][stage1] [PATCH v2] LTO dump tool marxin
  2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
  2019-03-14 14:00 ` [PATCH 3/3] Fix GNU coding style in lto-common.c marxin
@ 2019-03-14 14:06 ` marxin
  2019-04-26 12:47   ` Richard Biener
  2 siblings, 1 reply; 9+ messages in thread
From: marxin @ 2019-03-14 14:06 UTC (permalink / raw)
  To: gcc-patches; +Cc: hrishikeshparag, hubicka

[-- Attachment #1: Type: text/plain, Size: 773 bytes --]


gcc/lto/ChangeLog:

2019-03-14  Martin Liska  <mliska@suse.cz>
	    Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>

	* Make-lang.in: Add lto-common.o.
	* config-lang.in: Likewise for gtfiles.
	* lto-common.c: New file.
	* lto-common.h: New file.
	* lto-lang.c: Include lto-common.h.
	* lto.c: Move most of the functionality
	into lto-common.c file.
---
 gcc/lto/Make-lang.in   |    2 +-
 gcc/lto/config-lang.in |    2 +-
 gcc/lto/lto-common.c   | 2837 ++++++++++++++++++++++++++++++++++++++++
 gcc/lto/lto-common.h   |   33 +
 gcc/lto/lto-lang.c     |    1 +
 gcc/lto/lto.c          | 2837 +---------------------------------------
 6 files changed, 2899 insertions(+), 2813 deletions(-)
 create mode 100644 gcc/lto/lto-common.c
 create mode 100644 gcc/lto/lto-common.h


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Split-part-of-functionality-from-lto.c-to-lto-common.patch --]
[-- Type: text/x-patch; name="0001-Split-part-of-functionality-from-lto.c-to-lto-common.patch", Size: 179748 bytes --]

diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 1b856d6d435..b7ed96eac29 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -22,7 +22,7 @@
 # The name of the LTO compiler.
 LTO_EXE = lto1$(exeext)
 # The LTO-specific object files inclued in $(LTO_EXE).
-LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o
+LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-common.o
 lto_OBJS = $(LTO_OBJS)
 
 # this is only useful in a LTO bootstrap, but this does not work right
diff --git a/gcc/lto/config-lang.in b/gcc/lto/config-lang.in
index de97125040c..07214365fd8 100644
--- a/gcc/lto/config-lang.in
+++ b/gcc/lto/config-lang.in
@@ -20,7 +20,7 @@
 language="lto"
 compilers="lto1\$(exeext)"
 
-gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h"
+gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h \$(srcdir)/lto/lto-common.h \$(srcdir)/lto/lto-common.c"
 
 # LTO is a special front end.  From a user's perspective it is not
 # really a language, but a middle end feature.  However, the GIMPLE
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
new file mode 100644
index 00000000000..9d5b034729e
--- /dev/null
+++ b/gcc/lto/lto-common.c
@@ -0,0 +1,2837 @@
+/* Top-level LTO routines.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Contributed by CodeSourcery, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "function.h"
+#include "bitmap.h"
+#include "basic-block.h"
+#include "tree.h"
+#include "gimple.h"
+#include "cfghooks.h"
+#include "alloc-pool.h"
+#include "tree-pass.h"
+#include "tree-streamer.h"
+#include "cgraph.h"
+#include "opts.h"
+#include "toplev.h"
+#include "stor-layout.h"
+#include "symbol-summary.h"
+#include "tree-vrp.h"
+#include "ipa-prop.h"
+#include "common.h"
+#include "debug.h"
+#include "lto.h"
+#include "lto-section-names.h"
+#include "splay-tree.h"
+#include "lto-partition.h"
+#include "context.h"
+#include "pass_manager.h"
+#include "ipa-fnsummary.h"
+#include "params.h"
+#include "ipa-utils.h"
+#include "gomp-constants.h"
+#include "lto-symtab.h"
+#include "stringpool.h"
+#include "fold-const.h"
+#include "attribs.h"
+#include "builtins.h"
+#include "lto-common.h"
+
+GTY(()) tree first_personality_decl;
+
+GTY(()) const unsigned char *lto_mode_identity_table;
+
+/* Returns a hash code for P.  */
+
+static hashval_t
+hash_name (const void *p)
+{
+  const struct lto_section_slot *ds = (const struct lto_section_slot *) p;
+  return (hashval_t) htab_hash_string (ds->name);
+}
+
+
+/* Returns nonzero if P1 and P2 are equal.  */
+
+static int
+eq_name (const void *p1, const void *p2)
+{
+  const struct lto_section_slot *s1 =
+    (const struct lto_section_slot *) p1;
+  const struct lto_section_slot *s2 =
+    (const struct lto_section_slot *) p2;
+
+  return strcmp (s1->name, s2->name) == 0;
+}
+
+/* Free lto_section_slot */
+
+static void
+free_with_string (void *arg)
+{
+  struct lto_section_slot *s = (struct lto_section_slot *)arg;
+
+  free (CONST_CAST (char *, s->name));
+  free (arg);
+}
+
+/* Create section hash table */
+
+htab_t 
+lto_obj_create_section_hash_table (void)
+{
+  return htab_create (37, hash_name, eq_name, free_with_string);
+}
+
+/* Delete an allocated integer KEY in the splay tree.  */
+
+static void
+lto_splay_tree_delete_id (splay_tree_key key)
+{
+  free ((void *) key);
+}
+
+/* Compare splay tree node ids A and B.  */
+
+static int
+lto_splay_tree_compare_ids (splay_tree_key a, splay_tree_key b)
+{
+  unsigned HOST_WIDE_INT ai;
+  unsigned HOST_WIDE_INT bi;
+
+  ai = *(unsigned HOST_WIDE_INT *) a;
+  bi = *(unsigned HOST_WIDE_INT *) b;
+
+  if (ai < bi)
+    return -1;
+  else if (ai > bi)
+    return 1;
+  return 0;
+}
+
+/* Look up splay tree node by ID in splay tree T.  */
+
+static splay_tree_node
+lto_splay_tree_lookup (splay_tree t, unsigned HOST_WIDE_INT id)
+{
+  return splay_tree_lookup (t, (splay_tree_key) &id);
+}
+
+/* Check if KEY has ID.  */
+
+static bool
+lto_splay_tree_id_equal_p (splay_tree_key key, unsigned HOST_WIDE_INT id)
+{
+  return *(unsigned HOST_WIDE_INT *) key == id;
+}
+
+/* Insert a splay tree node into tree T with ID as key and FILE_DATA as value. 
+   The ID is allocated separately because we need HOST_WIDE_INTs which may
+   be wider than a splay_tree_key. */
+
+static void
+lto_splay_tree_insert (splay_tree t, unsigned HOST_WIDE_INT id,
+		       struct lto_file_decl_data *file_data)
+{
+  unsigned HOST_WIDE_INT *idp = XCNEW (unsigned HOST_WIDE_INT);
+  *idp = id;
+  splay_tree_insert (t, (splay_tree_key) idp, (splay_tree_value) file_data);
+}
+
+/* Create a splay tree.  */
+
+static splay_tree
+lto_splay_tree_new (void)
+{
+  return splay_tree_new (lto_splay_tree_compare_ids,
+	 	         lto_splay_tree_delete_id,
+			 NULL);
+}
+
+/* Decode the content of memory pointed to by DATA in the in decl
+   state object STATE. DATA_IN points to a data_in structure for
+   decoding. Return the address after the decoded object in the
+   input.  */
+
+static const uint32_t *
+lto_read_in_decl_state (struct data_in *data_in, const uint32_t *data,
+			struct lto_in_decl_state *state)
+{
+  uint32_t ix;
+  tree decl;
+  uint32_t i, j;
+
+  ix = *data++;
+  state->compressed = ix & 1;
+  ix /= 2;
+  decl = streamer_tree_cache_get_tree (data_in->reader_cache, ix);
+  if (!VAR_OR_FUNCTION_DECL_P (decl))
+    {
+      gcc_assert (decl == void_type_node);
+      decl = NULL_TREE;
+    }
+  state->fn_decl = decl;
+
+  for (i = 0; i < LTO_N_DECL_STREAMS; i++)
+    {
+      uint32_t size = *data++;
+      vec<tree, va_gc> *decls = NULL;
+      vec_alloc (decls, size);
+
+      for (j = 0; j < size; j++)
+	vec_safe_push (decls,
+		       streamer_tree_cache_get_tree (data_in->reader_cache,
+						     data[j]));
+
+      state->streams[i] = decls;
+      data += size;
+    }
+
+  return data;
+}
+
+
+/* Global canonical type table.  */
+static htab_t gimple_canonical_types;
+static hash_map<const_tree, hashval_t> *canonical_type_hash_cache;
+static unsigned long num_canonical_type_hash_entries;
+static unsigned long num_canonical_type_hash_queries;
+
+static void iterative_hash_canonical_type (tree type, inchash::hash &hstate);
+static hashval_t gimple_canonical_type_hash (const void *p);
+static void gimple_register_canonical_type_1 (tree t, hashval_t hash);
+
+/* Returning a hash value for gimple type TYPE.
+
+   The hash value returned is equal for types considered compatible
+   by gimple_canonical_types_compatible_p.  */
+
+static hashval_t
+hash_canonical_type (tree type)
+{
+  inchash::hash hstate;
+  enum tree_code code;
+
+  /* We compute alias sets only for types that needs them.
+     Be sure we do not recurse to something else as we cannot hash incomplete
+     types in a way they would have same hash value as compatible complete
+     types.  */
+  gcc_checking_assert (type_with_alias_set_p (type));
+
+  /* Combine a few common features of types so that types are grouped into
+     smaller sets; when searching for existing matching types to merge,
+     only existing types having the same features as the new type will be
+     checked.  */
+  code = tree_code_for_canonical_type_merging (TREE_CODE (type));
+  hstate.add_int (code);
+  hstate.add_int (TYPE_MODE (type));
+
+  /* Incorporate common features of numerical types.  */
+  if (INTEGRAL_TYPE_P (type)
+      || SCALAR_FLOAT_TYPE_P (type)
+      || FIXED_POINT_TYPE_P (type)
+      || TREE_CODE (type) == OFFSET_TYPE
+      || POINTER_TYPE_P (type))
+    {
+      hstate.add_int (TYPE_PRECISION (type));
+      if (!type_with_interoperable_signedness (type))
+        hstate.add_int (TYPE_UNSIGNED (type));
+    }
+
+  if (VECTOR_TYPE_P (type))
+    {
+      hstate.add_poly_int (TYPE_VECTOR_SUBPARTS (type));
+      hstate.add_int (TYPE_UNSIGNED (type));
+    }
+
+  if (TREE_CODE (type) == COMPLEX_TYPE)
+    hstate.add_int (TYPE_UNSIGNED (type));
+
+  /* Fortran's C_SIGNED_CHAR is !TYPE_STRING_FLAG but needs to be
+     interoperable with "signed char".  Unless all frontends are revisited to
+     agree on these types, we must ignore the flag completely.  */
+
+  /* Fortran standard define C_PTR type that is compatible with every
+     C pointer.  For this reason we need to glob all pointers into one.
+     Still pointers in different address spaces are not compatible.  */
+  if (POINTER_TYPE_P (type))
+    hstate.add_int (TYPE_ADDR_SPACE (TREE_TYPE (type)));
+
+  /* For array types hash the domain bounds and the string flag.  */
+  if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type))
+    {
+      hstate.add_int (TYPE_STRING_FLAG (type));
+      /* OMP lowering can introduce error_mark_node in place of
+	 random local decls in types.  */
+      if (TYPE_MIN_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
+	inchash::add_expr (TYPE_MIN_VALUE (TYPE_DOMAIN (type)), hstate);
+      if (TYPE_MAX_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
+	inchash::add_expr (TYPE_MAX_VALUE (TYPE_DOMAIN (type)), hstate);
+    }
+
+  /* Recurse for aggregates with a single element type.  */
+  if (TREE_CODE (type) == ARRAY_TYPE
+      || TREE_CODE (type) == COMPLEX_TYPE
+      || TREE_CODE (type) == VECTOR_TYPE)
+    iterative_hash_canonical_type (TREE_TYPE (type), hstate);
+
+  /* Incorporate function return and argument types.  */
+  if (TREE_CODE (type) == FUNCTION_TYPE || TREE_CODE (type) == METHOD_TYPE)
+    {
+      unsigned na;
+      tree p;
+
+      iterative_hash_canonical_type (TREE_TYPE (type), hstate);
+
+      for (p = TYPE_ARG_TYPES (type), na = 0; p; p = TREE_CHAIN (p))
+	{
+	  iterative_hash_canonical_type (TREE_VALUE (p), hstate);
+	  na++;
+	}
+
+      hstate.add_int (na);
+    }
+
+  if (RECORD_OR_UNION_TYPE_P (type))
+    {
+      unsigned nf;
+      tree f;
+
+      for (f = TYPE_FIELDS (type), nf = 0; f; f = TREE_CHAIN (f))
+	if (TREE_CODE (f) == FIELD_DECL
+	    && (! DECL_SIZE (f)
+		|| ! integer_zerop (DECL_SIZE (f))))
+	  {
+	    iterative_hash_canonical_type (TREE_TYPE (f), hstate);
+	    nf++;
+	  }
+
+      hstate.add_int (nf);
+    }
+
+  return hstate.end();
+}
+
+/* Returning a hash value for gimple type TYPE combined with VAL.  */
+
+static void
+iterative_hash_canonical_type (tree type, inchash::hash &hstate)
+{
+  hashval_t v;
+
+  /* All type variants have same TYPE_CANONICAL.  */
+  type = TYPE_MAIN_VARIANT (type);
+
+  if (!canonical_type_used_p (type))
+    v = hash_canonical_type (type);
+  /* An already processed type.  */
+  else if (TYPE_CANONICAL (type))
+    {
+      type = TYPE_CANONICAL (type);
+      v = gimple_canonical_type_hash (type);
+    }
+  else
+    {
+      /* Canonical types should not be able to form SCCs by design, this
+	 recursion is just because we do not register canonical types in
+	 optimal order.  To avoid quadratic behavior also register the
+	 type here.  */
+      v = hash_canonical_type (type);
+      gimple_register_canonical_type_1 (type, v);
+    }
+  hstate.add_int (v);
+}
+
+/* Returns the hash for a canonical type P.  */
+
+static hashval_t
+gimple_canonical_type_hash (const void *p)
+{
+  num_canonical_type_hash_queries++;
+  hashval_t *slot = canonical_type_hash_cache->get ((const_tree) p);
+  gcc_assert (slot != NULL);
+  return *slot;
+}
+
+
+
+/* Returns nonzero if P1 and P2 are equal.  */
+
+static int
+gimple_canonical_type_eq (const void *p1, const void *p2)
+{
+  const_tree t1 = (const_tree) p1;
+  const_tree t2 = (const_tree) p2;
+  return gimple_canonical_types_compatible_p (CONST_CAST_TREE (t1),
+					      CONST_CAST_TREE (t2));
+}
+
+/* Main worker for gimple_register_canonical_type.  */
+
+static void
+gimple_register_canonical_type_1 (tree t, hashval_t hash)
+{
+  void **slot;
+
+  gcc_checking_assert (TYPE_P (t) && !TYPE_CANONICAL (t)
+		       && type_with_alias_set_p (t)
+		       && canonical_type_used_p (t));
+
+  slot = htab_find_slot_with_hash (gimple_canonical_types, t, hash, INSERT);
+  if (*slot)
+    {
+      tree new_type = (tree)(*slot);
+      gcc_checking_assert (new_type != t);
+      TYPE_CANONICAL (t) = new_type;
+    }
+  else
+    {
+      TYPE_CANONICAL (t) = t;
+      *slot = (void *) t;
+      /* Cache the just computed hash value.  */
+      num_canonical_type_hash_entries++;
+      bool existed_p = canonical_type_hash_cache->put (t, hash);
+      gcc_assert (!existed_p);
+    }
+}
+
+/* Register type T in the global type table gimple_types and set
+   TYPE_CANONICAL of T accordingly.
+   This is used by LTO to merge structurally equivalent types for
+   type-based aliasing purposes across different TUs and languages.
+
+   ???  This merging does not exactly match how the tree.c middle-end
+   functions will assign TYPE_CANONICAL when new types are created
+   during optimization (which at least happens for pointer and array
+   types).  */
+
+static void
+gimple_register_canonical_type (tree t)
+{
+  if (TYPE_CANONICAL (t) || !type_with_alias_set_p (t)
+      || !canonical_type_used_p (t))
+    return;
+
+  /* Canonical types are same among all complete variants.  */
+  if (TYPE_CANONICAL (TYPE_MAIN_VARIANT (t)))
+    TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
+  else
+    {
+      gimple_register_canonical_type_1 (TYPE_MAIN_VARIANT (t),
+					hash_canonical_type (TYPE_MAIN_VARIANT (t)));
+      TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
+    }
+}
+
+/* Re-compute TYPE_CANONICAL for NODE and related types.  */
+
+static void
+lto_register_canonical_types (tree node, bool first_p)
+{
+  if (!node
+      || !TYPE_P (node))
+    return;
+
+  if (first_p)
+    TYPE_CANONICAL (node) = NULL_TREE;
+
+  if (POINTER_TYPE_P (node)
+      || TREE_CODE (node) == COMPLEX_TYPE
+      || TREE_CODE (node) == ARRAY_TYPE)
+    lto_register_canonical_types (TREE_TYPE (node), first_p);
+
+ if (!first_p) 
+    gimple_register_canonical_type (node);
+}
+
+
+/* Remember trees that contains references to declarations.  */
+vec <tree, va_gc> *tree_with_vars;
+
+#define CHECK_VAR(tt) \
+  do \
+    { \
+      if ((tt) && VAR_OR_FUNCTION_DECL_P (tt) \
+	  && (TREE_PUBLIC (tt) || DECL_EXTERNAL (tt))) \
+	return true; \
+    } while (0)
+
+#define CHECK_NO_VAR(tt) \
+  gcc_checking_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt))
+
+/* Check presence of pointers to decls in fields of a tree_typed T.  */
+
+static inline bool
+mentions_vars_p_typed (tree t)
+{
+  CHECK_NO_VAR (TREE_TYPE (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a tree_common T.  */
+
+static inline bool
+mentions_vars_p_common (tree t)
+{
+  if (mentions_vars_p_typed (t))
+    return true;
+  CHECK_NO_VAR (TREE_CHAIN (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a decl_minimal T.  */
+
+static inline bool
+mentions_vars_p_decl_minimal (tree t)
+{
+  if (mentions_vars_p_common (t))
+    return true;
+  CHECK_NO_VAR (DECL_NAME (t));
+  CHECK_VAR (DECL_CONTEXT (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a decl_common T.  */
+
+static inline bool
+mentions_vars_p_decl_common (tree t)
+{
+  if (mentions_vars_p_decl_minimal (t))
+    return true;
+  CHECK_VAR (DECL_SIZE (t));
+  CHECK_VAR (DECL_SIZE_UNIT (t));
+  CHECK_VAR (DECL_INITIAL (t));
+  CHECK_NO_VAR (DECL_ATTRIBUTES (t));
+  CHECK_VAR (DECL_ABSTRACT_ORIGIN (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a decl_with_vis T.  */
+
+static inline bool
+mentions_vars_p_decl_with_vis (tree t)
+{
+  if (mentions_vars_p_decl_common (t))
+    return true;
+
+  /* Accessor macro has side-effects, use field-name here. */
+  CHECK_NO_VAR (DECL_ASSEMBLER_NAME_RAW (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a decl_non_common T.  */
+
+static inline bool
+mentions_vars_p_decl_non_common (tree t)
+{
+  if (mentions_vars_p_decl_with_vis (t))
+    return true;
+  CHECK_NO_VAR (DECL_RESULT_FLD (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a decl_non_common T.  */
+
+static bool
+mentions_vars_p_function (tree t)
+{
+  if (mentions_vars_p_decl_non_common (t))
+    return true;
+  CHECK_NO_VAR (DECL_ARGUMENTS (t));
+  CHECK_NO_VAR (DECL_VINDEX (t));
+  CHECK_VAR (DECL_FUNCTION_PERSONALITY (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a field_decl T.  */
+
+static bool
+mentions_vars_p_field_decl (tree t)
+{
+  if (mentions_vars_p_decl_common (t))
+    return true;
+  CHECK_VAR (DECL_FIELD_OFFSET (t));
+  CHECK_NO_VAR (DECL_BIT_FIELD_TYPE (t));
+  CHECK_NO_VAR (DECL_QUALIFIER (t));
+  CHECK_NO_VAR (DECL_FIELD_BIT_OFFSET (t));
+  CHECK_NO_VAR (DECL_FCONTEXT (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a type T.  */
+
+static bool
+mentions_vars_p_type (tree t)
+{
+  if (mentions_vars_p_common (t))
+    return true;
+  CHECK_NO_VAR (TYPE_CACHED_VALUES (t));
+  CHECK_VAR (TYPE_SIZE (t));
+  CHECK_VAR (TYPE_SIZE_UNIT (t));
+  CHECK_NO_VAR (TYPE_ATTRIBUTES (t));
+  CHECK_NO_VAR (TYPE_NAME (t));
+
+  CHECK_VAR (TYPE_MIN_VALUE_RAW (t));
+  CHECK_VAR (TYPE_MAX_VALUE_RAW (t));
+
+  /* Accessor is for derived node types only. */
+  CHECK_NO_VAR (TYPE_LANG_SLOT_1 (t));
+
+  CHECK_VAR (TYPE_CONTEXT (t));
+  CHECK_NO_VAR (TYPE_CANONICAL (t));
+  CHECK_NO_VAR (TYPE_MAIN_VARIANT (t));
+  CHECK_NO_VAR (TYPE_NEXT_VARIANT (t));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a BINFO T.  */
+
+static bool
+mentions_vars_p_binfo (tree t)
+{
+  unsigned HOST_WIDE_INT i, n;
+
+  if (mentions_vars_p_common (t))
+    return true;
+  CHECK_VAR (BINFO_VTABLE (t));
+  CHECK_NO_VAR (BINFO_OFFSET (t));
+  CHECK_NO_VAR (BINFO_VIRTUALS (t));
+  CHECK_NO_VAR (BINFO_VPTR_FIELD (t));
+  n = vec_safe_length (BINFO_BASE_ACCESSES (t));
+  for (i = 0; i < n; i++)
+    CHECK_NO_VAR (BINFO_BASE_ACCESS (t, i));
+  /* Do not walk BINFO_INHERITANCE_CHAIN, BINFO_SUBVTT_INDEX
+     and BINFO_VPTR_INDEX; these are used by C++ FE only.  */
+  n = BINFO_N_BASE_BINFOS (t);
+  for (i = 0; i < n; i++)
+    CHECK_NO_VAR (BINFO_BASE_BINFO (t, i));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of a CONSTRUCTOR T.  */
+
+static bool
+mentions_vars_p_constructor (tree t)
+{
+  unsigned HOST_WIDE_INT idx;
+  constructor_elt *ce;
+
+  if (mentions_vars_p_typed (t))
+    return true;
+
+  for (idx = 0; vec_safe_iterate (CONSTRUCTOR_ELTS (t), idx, &ce); idx++)
+    {
+      CHECK_NO_VAR (ce->index);
+      CHECK_VAR (ce->value);
+    }
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of an expression tree T.  */
+
+static bool
+mentions_vars_p_expr (tree t)
+{
+  int i;
+  if (mentions_vars_p_typed (t))
+    return true;
+  for (i = TREE_OPERAND_LENGTH (t) - 1; i >= 0; --i)
+    CHECK_VAR (TREE_OPERAND (t, i));
+  return false;
+}
+
+/* Check presence of pointers to decls in fields of an OMP_CLAUSE T.  */
+
+static bool
+mentions_vars_p_omp_clause (tree t)
+{
+  int i;
+  if (mentions_vars_p_common (t))
+    return true;
+  for (i = omp_clause_num_ops[OMP_CLAUSE_CODE (t)] - 1; i >= 0; --i)
+    CHECK_VAR (OMP_CLAUSE_OPERAND (t, i));
+  return false;
+}
+
+/* Check presence of pointers to decls that needs later fixup in T.  */
+
+static bool
+mentions_vars_p (tree t)
+{
+  switch (TREE_CODE (t))
+    {
+    case IDENTIFIER_NODE:
+      break;
+
+    case TREE_LIST:
+      CHECK_VAR (TREE_VALUE (t));
+      CHECK_VAR (TREE_PURPOSE (t));
+      CHECK_NO_VAR (TREE_CHAIN (t));
+      break;
+
+    case FIELD_DECL:
+      return mentions_vars_p_field_decl (t);
+
+    case LABEL_DECL:
+    case CONST_DECL:
+    case PARM_DECL:
+    case RESULT_DECL:
+    case IMPORTED_DECL:
+    case NAMESPACE_DECL:
+    case NAMELIST_DECL:
+      return mentions_vars_p_decl_common (t);
+
+    case VAR_DECL:
+      return mentions_vars_p_decl_with_vis (t);
+
+    case TYPE_DECL:
+      return mentions_vars_p_decl_non_common (t);
+
+    case FUNCTION_DECL:
+      return mentions_vars_p_function (t);
+
+    case TREE_BINFO:
+      return mentions_vars_p_binfo (t);
+
+    case PLACEHOLDER_EXPR:
+      return mentions_vars_p_common (t);
+
+    case BLOCK:
+    case TRANSLATION_UNIT_DECL:
+    case OPTIMIZATION_NODE:
+    case TARGET_OPTION_NODE:
+      break;
+
+    case CONSTRUCTOR:
+      return mentions_vars_p_constructor (t);
+
+    case OMP_CLAUSE:
+      return mentions_vars_p_omp_clause (t);
+
+    default:
+      if (TYPE_P (t))
+	{
+	  if (mentions_vars_p_type (t))
+	    return true;
+	}
+      else if (EXPR_P (t))
+	{
+	  if (mentions_vars_p_expr (t))
+	    return true;
+	}
+      else if (CONSTANT_CLASS_P (t))
+	CHECK_NO_VAR (TREE_TYPE (t));
+      else
+	gcc_unreachable ();
+    }
+  return false;
+}
+
+
+/* Return the resolution for the decl with index INDEX from DATA_IN. */
+
+static enum ld_plugin_symbol_resolution
+get_resolution (struct data_in *data_in, unsigned index)
+{
+  if (data_in->globals_resolution.exists ())
+    {
+      ld_plugin_symbol_resolution_t ret;
+      /* We can have references to not emitted functions in
+	 DECL_FUNCTION_PERSONALITY at least.  So we can and have
+	 to indeed return LDPR_UNKNOWN in some cases.   */
+      if (data_in->globals_resolution.length () <= index)
+	return LDPR_UNKNOWN;
+      ret = data_in->globals_resolution[index];
+      return ret;
+    }
+  else
+    /* Delay resolution finding until decl merging.  */
+    return LDPR_UNKNOWN;
+}
+
+/* We need to record resolutions until symbol table is read.  */
+static void
+register_resolution (struct lto_file_decl_data *file_data, tree decl,
+		     enum ld_plugin_symbol_resolution resolution)
+{
+  bool existed;
+  if (resolution == LDPR_UNKNOWN)
+    return;
+  if (!file_data->resolution_map)
+    file_data->resolution_map
+      = new hash_map<tree, ld_plugin_symbol_resolution>;
+  ld_plugin_symbol_resolution_t &res
+     = file_data->resolution_map->get_or_insert (decl, &existed);
+  if (!existed
+      || resolution == LDPR_PREVAILING_DEF_IRONLY
+      || resolution == LDPR_PREVAILING_DEF
+      || resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
+    res = resolution;
+}
+
+/* Register DECL with the global symbol table and change its
+   name if necessary to avoid name clashes for static globals across
+   different files.  */
+
+static void
+lto_register_var_decl_in_symtab (struct data_in *data_in, tree decl,
+				 unsigned ix)
+{
+  tree context;
+
+  /* Variable has file scope, not local.  */
+  if (!TREE_PUBLIC (decl)
+      && !((context = decl_function_context (decl))
+	   && auto_var_in_fn_p (decl, context)))
+    rest_of_decl_compilation (decl, 1, 0);
+
+  /* If this variable has already been declared, queue the
+     declaration for merging.  */
+  if (TREE_PUBLIC (decl))
+    register_resolution (data_in->file_data,
+			 decl, get_resolution (data_in, ix));
+}
+
+
+/* Register DECL with the global symbol table and change its
+   name if necessary to avoid name clashes for static globals across
+   different files.  DATA_IN contains descriptors and tables for the
+   file being read.  */
+
+static void
+lto_register_function_decl_in_symtab (struct data_in *data_in, tree decl,
+				      unsigned ix)
+{
+  /* If this variable has already been declared, queue the
+     declaration for merging.  */
+  if (TREE_PUBLIC (decl) && !DECL_ABSTRACT_P (decl))
+    register_resolution (data_in->file_data,
+			 decl, get_resolution (data_in, ix));
+}
+
+/* Check if T is a decl and needs register its resolution info.  */
+
+static void
+lto_maybe_register_decl (struct data_in *data_in, tree t, unsigned ix)
+{
+  if (TREE_CODE (t) == VAR_DECL)
+    lto_register_var_decl_in_symtab (data_in, t, ix);
+  else if (TREE_CODE (t) == FUNCTION_DECL
+	   && !fndecl_built_in_p (t))
+    lto_register_function_decl_in_symtab (data_in, t, ix);
+}
+
+
+/* For the type T re-materialize it in the type variant list and
+   the pointer/reference-to chains.  */
+
+static void
+lto_fixup_prevailing_type (tree t)
+{
+  /* The following re-creates proper variant lists while fixing up
+     the variant leaders.  We do not stream TYPE_NEXT_VARIANT so the
+     variant list state before fixup is broken.  */
+
+  /* If we are not our own variant leader link us into our new leaders
+     variant list.  */
+  if (TYPE_MAIN_VARIANT (t) != t)
+    {
+      tree mv = TYPE_MAIN_VARIANT (t);
+      TYPE_NEXT_VARIANT (t) = TYPE_NEXT_VARIANT (mv);
+      TYPE_NEXT_VARIANT (mv) = t;
+    }
+
+  /* The following reconstructs the pointer chains
+     of the new pointed-to type if we are a main variant.  We do
+     not stream those so they are broken before fixup.  */
+  if (TREE_CODE (t) == POINTER_TYPE
+      && TYPE_MAIN_VARIANT (t) == t)
+    {
+      TYPE_NEXT_PTR_TO (t) = TYPE_POINTER_TO (TREE_TYPE (t));
+      TYPE_POINTER_TO (TREE_TYPE (t)) = t;
+    }
+  else if (TREE_CODE (t) == REFERENCE_TYPE
+	   && TYPE_MAIN_VARIANT (t) == t)
+    {
+      TYPE_NEXT_REF_TO (t) = TYPE_REFERENCE_TO (TREE_TYPE (t));
+      TYPE_REFERENCE_TO (TREE_TYPE (t)) = t;
+    }
+}
+
+
+/* We keep prevailing tree SCCs in a hashtable with manual collision
+   handling (in case all hashes compare the same) and keep the colliding
+   entries in the tree_scc->next chain.  */
+
+struct tree_scc
+{
+  tree_scc *next;
+  /* Hash of the whole SCC.  */
+  hashval_t hash;
+  /* Number of trees in the SCC.  */
+  unsigned len;
+  /* Number of possible entries into the SCC (tree nodes [0..entry_len-1]
+     which share the same individual tree hash).  */
+  unsigned entry_len;
+  /* The members of the SCC.
+     We only need to remember the first entry node candidate for prevailing
+     SCCs (but of course have access to all entries for SCCs we are
+     processing).
+     ???  For prevailing SCCs we really only need hash and the first
+     entry candidate, but that's too awkward to implement.  */
+  tree entries[1];
+};
+
+struct tree_scc_hasher : nofree_ptr_hash <tree_scc>
+{
+  static inline hashval_t hash (const tree_scc *);
+  static inline bool equal (const tree_scc *, const tree_scc *);
+};
+
+hashval_t
+tree_scc_hasher::hash (const tree_scc *scc)
+{
+  return scc->hash;
+}
+
+bool
+tree_scc_hasher::equal (const tree_scc *scc1, const tree_scc *scc2)
+{
+  if (scc1->hash != scc2->hash
+      || scc1->len != scc2->len
+      || scc1->entry_len != scc2->entry_len)
+    return false;
+  return true;
+}
+
+static hash_table<tree_scc_hasher> *tree_scc_hash;
+static struct obstack tree_scc_hash_obstack;
+
+static unsigned long num_merged_types;
+static unsigned long num_prevailing_types;
+static unsigned long num_type_scc_trees;
+static unsigned long total_scc_size;
+static unsigned long num_sccs_read;
+static unsigned long total_scc_size_merged;
+static unsigned long num_sccs_merged;
+static unsigned long num_scc_compares;
+static unsigned long num_scc_compare_collisions;
+
+
+/* Compare the two entries T1 and T2 of two SCCs that are possibly equal,
+   recursing through in-SCC tree edges.  Returns true if the SCCs entered
+   through T1 and T2 are equal and fills in *MAP with the pairs of
+   SCC entries we visited, starting with (*MAP)[0] = T1 and (*MAP)[1] = T2.  */
+
+static bool
+compare_tree_sccs_1 (tree t1, tree t2, tree **map)
+{
+  enum tree_code code;
+
+  /* Mark already visited nodes.  */
+  TREE_ASM_WRITTEN (t2) = 1;
+
+  /* Push the pair onto map.  */
+  (*map)[0] = t1;
+  (*map)[1] = t2;
+  *map = *map + 2;
+
+  /* Compare value-fields.  */
+#define compare_values(X) \
+  do { \
+    if (X(t1) != X(t2)) \
+      return false; \
+  } while (0)
+
+  compare_values (TREE_CODE);
+  code = TREE_CODE (t1);
+
+  if (!TYPE_P (t1))
+    {
+      compare_values (TREE_SIDE_EFFECTS);
+      compare_values (TREE_CONSTANT);
+      compare_values (TREE_READONLY);
+      compare_values (TREE_PUBLIC);
+    }
+  compare_values (TREE_ADDRESSABLE);
+  compare_values (TREE_THIS_VOLATILE);
+  if (DECL_P (t1))
+    compare_values (DECL_UNSIGNED);
+  else if (TYPE_P (t1))
+    compare_values (TYPE_UNSIGNED);
+  if (TYPE_P (t1))
+    compare_values (TYPE_ARTIFICIAL);
+  else
+    compare_values (TREE_NO_WARNING);
+  compare_values (TREE_NOTHROW);
+  compare_values (TREE_STATIC);
+  if (code != TREE_BINFO)
+    compare_values (TREE_PRIVATE);
+  compare_values (TREE_PROTECTED);
+  compare_values (TREE_DEPRECATED);
+  if (TYPE_P (t1))
+    {
+      if (AGGREGATE_TYPE_P (t1))
+	compare_values (TYPE_REVERSE_STORAGE_ORDER);
+      else
+	compare_values (TYPE_SATURATING);
+      compare_values (TYPE_ADDR_SPACE);
+    }
+  else if (code == SSA_NAME)
+    compare_values (SSA_NAME_IS_DEFAULT_DEF);
+
+  if (CODE_CONTAINS_STRUCT (code, TS_INT_CST))
+    {
+      if (wi::to_wide (t1) != wi::to_wide (t2))
+	return false;
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_REAL_CST))
+    {
+      /* ???  No suitable compare routine available.  */
+      REAL_VALUE_TYPE r1 = TREE_REAL_CST (t1);
+      REAL_VALUE_TYPE r2 = TREE_REAL_CST (t2);
+      if (r1.cl != r2.cl
+	  || r1.decimal != r2.decimal
+	  || r1.sign != r2.sign
+	  || r1.signalling != r2.signalling
+	  || r1.canonical != r2.canonical
+	  || r1.uexp != r2.uexp)
+	return false;
+      for (unsigned i = 0; i < SIGSZ; ++i)
+	if (r1.sig[i] != r2.sig[i])
+	  return false;
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_FIXED_CST))
+    if (!fixed_compare (EQ_EXPR,
+			TREE_FIXED_CST_PTR (t1), TREE_FIXED_CST_PTR (t2)))
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_VECTOR))
+    {
+      compare_values (VECTOR_CST_LOG2_NPATTERNS);
+      compare_values (VECTOR_CST_NELTS_PER_PATTERN);
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
+    {
+      compare_values (DECL_MODE);
+      compare_values (DECL_NONLOCAL);
+      compare_values (DECL_VIRTUAL_P);
+      compare_values (DECL_IGNORED_P);
+      compare_values (DECL_ABSTRACT_P);
+      compare_values (DECL_ARTIFICIAL);
+      compare_values (DECL_USER_ALIGN);
+      compare_values (DECL_PRESERVE_P);
+      compare_values (DECL_EXTERNAL);
+      compare_values (DECL_GIMPLE_REG_P);
+      compare_values (DECL_ALIGN);
+      if (code == LABEL_DECL)
+	{
+	  compare_values (EH_LANDING_PAD_NR);
+	  compare_values (LABEL_DECL_UID);
+	}
+      else if (code == FIELD_DECL)
+	{
+	  compare_values (DECL_PACKED);
+	  compare_values (DECL_NONADDRESSABLE_P);
+	  compare_values (DECL_PADDING_P);
+	  compare_values (DECL_OFFSET_ALIGN);
+	}
+      else if (code == VAR_DECL)
+	{
+	  compare_values (DECL_HAS_DEBUG_EXPR_P);
+	  compare_values (DECL_NONLOCAL_FRAME);
+	}
+      if (code == RESULT_DECL
+	  || code == PARM_DECL
+	  || code == VAR_DECL)
+	{
+	  compare_values (DECL_BY_REFERENCE);
+	  if (code == VAR_DECL
+	      || code == PARM_DECL)
+	    compare_values (DECL_HAS_VALUE_EXPR_P);
+	}
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WRTL))
+    compare_values (DECL_REGISTER);
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
+    {
+      compare_values (DECL_COMMON);
+      compare_values (DECL_DLLIMPORT_P);
+      compare_values (DECL_WEAK);
+      compare_values (DECL_SEEN_IN_BIND_EXPR_P);
+      compare_values (DECL_COMDAT);
+      compare_values (DECL_VISIBILITY);
+      compare_values (DECL_VISIBILITY_SPECIFIED);
+      if (code == VAR_DECL)
+	{
+	  compare_values (DECL_HARD_REGISTER);
+          /* DECL_IN_TEXT_SECTION is set during final asm output only.  */
+	  compare_values (DECL_IN_CONSTANT_POOL);
+	}
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
+    {
+      compare_values (DECL_BUILT_IN_CLASS);
+      compare_values (DECL_STATIC_CONSTRUCTOR);
+      compare_values (DECL_STATIC_DESTRUCTOR);
+      compare_values (DECL_UNINLINABLE);
+      compare_values (DECL_POSSIBLY_INLINED);
+      compare_values (DECL_IS_NOVOPS);
+      compare_values (DECL_IS_RETURNS_TWICE);
+      compare_values (DECL_IS_MALLOC);
+      compare_values (DECL_IS_OPERATOR_NEW);
+      compare_values (DECL_DECLARED_INLINE_P);
+      compare_values (DECL_STATIC_CHAIN);
+      compare_values (DECL_NO_INLINE_WARNING_P);
+      compare_values (DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT);
+      compare_values (DECL_NO_LIMIT_STACK);
+      compare_values (DECL_DISREGARD_INLINE_LIMITS);
+      compare_values (DECL_PURE_P);
+      compare_values (DECL_LOOPING_CONST_OR_PURE_P);
+      compare_values (DECL_FINAL_P);
+      compare_values (DECL_CXX_CONSTRUCTOR_P);
+      compare_values (DECL_CXX_DESTRUCTOR_P);
+      if (DECL_BUILT_IN_CLASS (t1) != NOT_BUILT_IN)
+	compare_values (DECL_FUNCTION_CODE);
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_COMMON))
+    {
+      compare_values (TYPE_MODE);
+      compare_values (TYPE_STRING_FLAG);
+      compare_values (TYPE_NEEDS_CONSTRUCTING);
+      if (RECORD_OR_UNION_TYPE_P (t1))
+	{
+	  compare_values (TYPE_TRANSPARENT_AGGR);
+	  compare_values (TYPE_FINAL_P);
+	}
+      else if (code == ARRAY_TYPE)
+	compare_values (TYPE_NONALIASED_COMPONENT);
+      if (AGGREGATE_TYPE_P (t1))
+	compare_values (TYPE_TYPELESS_STORAGE);
+      compare_values (TYPE_EMPTY_P);
+      compare_values (TYPE_PACKED);
+      compare_values (TYPE_RESTRICT);
+      compare_values (TYPE_USER_ALIGN);
+      compare_values (TYPE_READONLY);
+      compare_values (TYPE_PRECISION);
+      compare_values (TYPE_ALIGN);
+      /* Do not compare TYPE_ALIAS_SET.  Doing so introduce ordering issues
+         with calls to get_alias_set which may initialize it for streamed
+ 	 in types.  */
+    }
+
+  /* We don't want to compare locations, so there is nothing do compare
+     for TS_EXP.  */
+
+  /* BLOCKs are function local and we don't merge anything there, so
+     simply refuse to merge.  */
+  if (CODE_CONTAINS_STRUCT (code, TS_BLOCK))
+    return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TRANSLATION_UNIT_DECL))
+    if (strcmp (TRANSLATION_UNIT_LANGUAGE (t1),
+		TRANSLATION_UNIT_LANGUAGE (t2)) != 0)
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TARGET_OPTION))
+    if (!cl_target_option_eq (TREE_TARGET_OPTION (t1), TREE_TARGET_OPTION (t2)))
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_OPTIMIZATION))
+    if (!cl_optimization_option_eq (TREE_OPTIMIZATION (t1),
+				    TREE_OPTIMIZATION (t2)))
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_BINFO))
+    if (vec_safe_length (BINFO_BASE_ACCESSES (t1))
+	!= vec_safe_length (BINFO_BASE_ACCESSES (t2)))
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_CONSTRUCTOR))
+    compare_values (CONSTRUCTOR_NELTS);
+
+  if (CODE_CONTAINS_STRUCT (code, TS_IDENTIFIER))
+    if (IDENTIFIER_LENGTH (t1) != IDENTIFIER_LENGTH (t2)
+	|| memcmp (IDENTIFIER_POINTER (t1), IDENTIFIER_POINTER (t2),
+		   IDENTIFIER_LENGTH (t1)) != 0)
+      return false;
+
+  if (CODE_CONTAINS_STRUCT (code, TS_STRING))
+    if (TREE_STRING_LENGTH (t1) != TREE_STRING_LENGTH (t2)
+	|| memcmp (TREE_STRING_POINTER (t1), TREE_STRING_POINTER (t2),
+		   TREE_STRING_LENGTH (t1)) != 0)
+      return false;
+
+  if (code == OMP_CLAUSE)
+    {
+      compare_values (OMP_CLAUSE_CODE);
+      switch (OMP_CLAUSE_CODE (t1))
+	{
+	case OMP_CLAUSE_DEFAULT:
+	  compare_values (OMP_CLAUSE_DEFAULT_KIND);
+	  break;
+	case OMP_CLAUSE_SCHEDULE:
+	  compare_values (OMP_CLAUSE_SCHEDULE_KIND);
+	  break;
+	case OMP_CLAUSE_DEPEND:
+	  compare_values (OMP_CLAUSE_DEPEND_KIND);
+	  break;
+	case OMP_CLAUSE_MAP:
+	  compare_values (OMP_CLAUSE_MAP_KIND);
+	  break;
+	case OMP_CLAUSE_PROC_BIND:
+	  compare_values (OMP_CLAUSE_PROC_BIND_KIND);
+	  break;
+	case OMP_CLAUSE_REDUCTION:
+	  compare_values (OMP_CLAUSE_REDUCTION_CODE);
+	  compare_values (OMP_CLAUSE_REDUCTION_GIMPLE_INIT);
+	  compare_values (OMP_CLAUSE_REDUCTION_GIMPLE_MERGE);
+	  break;
+	default:
+	  break;
+	}
+    }
+
+#undef compare_values
+
+
+  /* Compare pointer fields.  */
+
+  /* Recurse.  Search & Replaced from DFS_write_tree_body.
+     Folding the early checks into the compare_tree_edges recursion
+     macro makes debugging way quicker as you are able to break on
+     compare_tree_sccs_1 and simply finish until a call returns false
+     to spot the SCC members with the difference.  */
+#define compare_tree_edges(E1, E2) \
+  do { \
+    tree t1_ = (E1), t2_ = (E2); \
+    if (t1_ != t2_ \
+	&& (!t1_ || !t2_ \
+	    || !TREE_VISITED (t2_) \
+	    || (!TREE_ASM_WRITTEN (t2_) \
+		&& !compare_tree_sccs_1 (t1_, t2_, map)))) \
+      return false; \
+    /* Only non-NULL trees outside of the SCC may compare equal.  */ \
+    gcc_checking_assert (t1_ != t2_ || (!t2_ || !TREE_VISITED (t2_))); \
+  } while (0)
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TYPED))
+    {
+      if (code != IDENTIFIER_NODE)
+	compare_tree_edges (TREE_TYPE (t1), TREE_TYPE (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_VECTOR))
+    {
+      /* Note that the number of elements for EXPR has already been emitted
+	 in EXPR's header (see streamer_write_tree_header).  */
+      unsigned int count = vector_cst_encoded_nelts (t1);
+      for (unsigned int i = 0; i < count; ++i)
+	compare_tree_edges (VECTOR_CST_ENCODED_ELT (t1, i),
+			    VECTOR_CST_ENCODED_ELT (t2, i));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_COMPLEX))
+    {
+      compare_tree_edges (TREE_REALPART (t1), TREE_REALPART (t2));
+      compare_tree_edges (TREE_IMAGPART (t1), TREE_IMAGPART (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_MINIMAL))
+    {
+      compare_tree_edges (DECL_NAME (t1), DECL_NAME (t2));
+      /* ???  Global decls from different TUs have non-matching
+	 TRANSLATION_UNIT_DECLs.  Only consider a small set of
+	 decls equivalent, we should not end up merging others.  */
+      if ((code == TYPE_DECL
+	   || code == NAMESPACE_DECL
+	   || code == IMPORTED_DECL
+	   || code == CONST_DECL
+	   || (VAR_OR_FUNCTION_DECL_P (t1)
+	       && (TREE_PUBLIC (t1) || DECL_EXTERNAL (t1))))
+	  && DECL_FILE_SCOPE_P (t1) && DECL_FILE_SCOPE_P (t2))
+	;
+      else
+	compare_tree_edges (DECL_CONTEXT (t1), DECL_CONTEXT (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
+    {
+      compare_tree_edges (DECL_SIZE (t1), DECL_SIZE (t2));
+      compare_tree_edges (DECL_SIZE_UNIT (t1), DECL_SIZE_UNIT (t2));
+      compare_tree_edges (DECL_ATTRIBUTES (t1), DECL_ATTRIBUTES (t2));
+      compare_tree_edges (DECL_ABSTRACT_ORIGIN (t1), DECL_ABSTRACT_ORIGIN (t2));
+      if ((code == VAR_DECL
+	   || code == PARM_DECL)
+	  && DECL_HAS_VALUE_EXPR_P (t1))
+	compare_tree_edges (DECL_VALUE_EXPR (t1), DECL_VALUE_EXPR (t2));
+      if (code == VAR_DECL
+	  && DECL_HAS_DEBUG_EXPR_P (t1))
+	compare_tree_edges (DECL_DEBUG_EXPR (t1), DECL_DEBUG_EXPR (t2));
+      /* LTO specific edges.  */
+      if (code != FUNCTION_DECL
+	  && code != TRANSLATION_UNIT_DECL)
+	compare_tree_edges (DECL_INITIAL (t1), DECL_INITIAL (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_NON_COMMON))
+    {
+      if (code == FUNCTION_DECL)
+	{
+	  tree a1, a2;
+	  for (a1 = DECL_ARGUMENTS (t1), a2 = DECL_ARGUMENTS (t2);
+	       a1 || a2;
+	       a1 = TREE_CHAIN (a1), a2 = TREE_CHAIN (a2))
+	    compare_tree_edges (a1, a2);
+	  compare_tree_edges (DECL_RESULT (t1), DECL_RESULT (t2));
+	}
+      else if (code == TYPE_DECL)
+	compare_tree_edges (DECL_ORIGINAL_TYPE (t1), DECL_ORIGINAL_TYPE (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
+    {
+      /* Make sure we don't inadvertently set the assembler name.  */
+      if (DECL_ASSEMBLER_NAME_SET_P (t1))
+	compare_tree_edges (DECL_ASSEMBLER_NAME (t1),
+			    DECL_ASSEMBLER_NAME (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_FIELD_DECL))
+    {
+      compare_tree_edges (DECL_FIELD_OFFSET (t1), DECL_FIELD_OFFSET (t2));
+      compare_tree_edges (DECL_BIT_FIELD_TYPE (t1), DECL_BIT_FIELD_TYPE (t2));
+      compare_tree_edges (DECL_BIT_FIELD_REPRESENTATIVE (t1),
+			  DECL_BIT_FIELD_REPRESENTATIVE (t2));
+      compare_tree_edges (DECL_FIELD_BIT_OFFSET (t1),
+			  DECL_FIELD_BIT_OFFSET (t2));
+      compare_tree_edges (DECL_FCONTEXT (t1), DECL_FCONTEXT (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
+    {
+      compare_tree_edges (DECL_FUNCTION_PERSONALITY (t1),
+			  DECL_FUNCTION_PERSONALITY (t2));
+      compare_tree_edges (DECL_VINDEX (t1), DECL_VINDEX (t2));
+      compare_tree_edges (DECL_FUNCTION_SPECIFIC_TARGET (t1),
+			  DECL_FUNCTION_SPECIFIC_TARGET (t2));
+      compare_tree_edges (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (t1),
+			  DECL_FUNCTION_SPECIFIC_OPTIMIZATION (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_COMMON))
+    {
+      compare_tree_edges (TYPE_SIZE (t1), TYPE_SIZE (t2));
+      compare_tree_edges (TYPE_SIZE_UNIT (t1), TYPE_SIZE_UNIT (t2));
+      compare_tree_edges (TYPE_ATTRIBUTES (t1), TYPE_ATTRIBUTES (t2));
+      compare_tree_edges (TYPE_NAME (t1), TYPE_NAME (t2));
+      /* Do not compare TYPE_POINTER_TO or TYPE_REFERENCE_TO.  They will be
+	 reconstructed during fixup.  */
+      /* Do not compare TYPE_NEXT_VARIANT, we reconstruct the variant lists
+	 during fixup.  */
+      compare_tree_edges (TYPE_MAIN_VARIANT (t1), TYPE_MAIN_VARIANT (t2));
+      /* ???  Global types from different TUs have non-matching
+	 TRANSLATION_UNIT_DECLs.  Still merge them if they are otherwise
+	 equal.  */
+      if (TYPE_FILE_SCOPE_P (t1) && TYPE_FILE_SCOPE_P (t2))
+	;
+      else
+	compare_tree_edges (TYPE_CONTEXT (t1), TYPE_CONTEXT (t2));
+      /* TYPE_CANONICAL is re-computed during type merging, so do not
+	 compare it here.  */
+      compare_tree_edges (TYPE_STUB_DECL (t1), TYPE_STUB_DECL (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_NON_COMMON))
+    {
+      if (code == ENUMERAL_TYPE)
+	compare_tree_edges (TYPE_VALUES (t1), TYPE_VALUES (t2));
+      else if (code == ARRAY_TYPE)
+	compare_tree_edges (TYPE_DOMAIN (t1), TYPE_DOMAIN (t2));
+      else if (RECORD_OR_UNION_TYPE_P (t1))
+	{
+	  tree f1, f2;
+	  for (f1 = TYPE_FIELDS (t1), f2 = TYPE_FIELDS (t2);
+	       f1 || f2;
+	       f1 = TREE_CHAIN (f1), f2 = TREE_CHAIN (f2))
+	    compare_tree_edges (f1, f2);
+	}
+      else if (code == FUNCTION_TYPE
+	       || code == METHOD_TYPE)
+	compare_tree_edges (TYPE_ARG_TYPES (t1), TYPE_ARG_TYPES (t2));
+
+      if (!POINTER_TYPE_P (t1))
+	compare_tree_edges (TYPE_MIN_VALUE_RAW (t1), TYPE_MIN_VALUE_RAW (t2));
+      compare_tree_edges (TYPE_MAX_VALUE_RAW (t1), TYPE_MAX_VALUE_RAW (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_LIST))
+    {
+      compare_tree_edges (TREE_PURPOSE (t1), TREE_PURPOSE (t2));
+      compare_tree_edges (TREE_VALUE (t1), TREE_VALUE (t2));
+      compare_tree_edges (TREE_CHAIN (t1), TREE_CHAIN (t2));
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_VEC))
+    for (int i = 0; i < TREE_VEC_LENGTH (t1); i++)
+      compare_tree_edges (TREE_VEC_ELT (t1, i), TREE_VEC_ELT (t2, i));
+
+  if (CODE_CONTAINS_STRUCT (code, TS_EXP))
+    {
+      for (int i = 0; i < TREE_OPERAND_LENGTH (t1); i++)
+	compare_tree_edges (TREE_OPERAND (t1, i),
+			    TREE_OPERAND (t2, i));
+
+      /* BLOCKs are function local and we don't merge anything there.  */
+      if (TREE_BLOCK (t1) || TREE_BLOCK (t2))
+	return false;
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_BINFO))
+    {
+      unsigned i;
+      tree t;
+      /* Lengths have already been compared above.  */
+      FOR_EACH_VEC_ELT (*BINFO_BASE_BINFOS (t1), i, t)
+	compare_tree_edges (t, BINFO_BASE_BINFO (t2, i));
+      FOR_EACH_VEC_SAFE_ELT (BINFO_BASE_ACCESSES (t1), i, t)
+	compare_tree_edges (t, BINFO_BASE_ACCESS (t2, i));
+      compare_tree_edges (BINFO_OFFSET (t1), BINFO_OFFSET (t2));
+      compare_tree_edges (BINFO_VTABLE (t1), BINFO_VTABLE (t2));
+      compare_tree_edges (BINFO_VPTR_FIELD (t1), BINFO_VPTR_FIELD (t2));
+      /* Do not walk BINFO_INHERITANCE_CHAIN, BINFO_SUBVTT_INDEX
+	 and BINFO_VPTR_INDEX; these are used by C++ FE only.  */
+    }
+
+  if (CODE_CONTAINS_STRUCT (code, TS_CONSTRUCTOR))
+    {
+      unsigned i;
+      tree index, value;
+      /* Lengths have already been compared above.  */
+      FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (t1), i, index, value)
+	{
+	  compare_tree_edges (index, CONSTRUCTOR_ELT (t2, i)->index);
+	  compare_tree_edges (value, CONSTRUCTOR_ELT (t2, i)->value);
+	}
+    }
+
+  if (code == OMP_CLAUSE)
+    {
+      int i;
+
+      for (i = 0; i < omp_clause_num_ops[OMP_CLAUSE_CODE (t1)]; i++)
+	compare_tree_edges (OMP_CLAUSE_OPERAND (t1, i),
+			    OMP_CLAUSE_OPERAND (t2, i));
+      compare_tree_edges (OMP_CLAUSE_CHAIN (t1), OMP_CLAUSE_CHAIN (t2));
+    }
+
+#undef compare_tree_edges
+
+  return true;
+}
+
+/* Compare the tree scc SCC to the prevailing candidate PSCC, filling
+   out MAP if they are equal.  */
+
+static bool
+compare_tree_sccs (tree_scc *pscc, tree_scc *scc,
+		   tree *map)
+{
+  /* Assume SCC entry hashes are sorted after their cardinality.  Which
+     means we can simply take the first n-tuple of equal hashes
+     (which is recorded as entry_len) and do n SCC entry candidate
+     comparisons.  */
+  for (unsigned i = 0; i < pscc->entry_len; ++i)
+    {
+      tree *mapp = map;
+      num_scc_compare_collisions++;
+      if (compare_tree_sccs_1 (pscc->entries[0], scc->entries[i], &mapp))
+	{
+	  /* Equal - no need to reset TREE_VISITED or TREE_ASM_WRITTEN
+	     on the scc as all trees will be freed.  */
+	  return true;
+	}
+      /* Reset TREE_ASM_WRITTEN on scc for the next compare or in case
+         the SCC prevails.  */
+      for (unsigned j = 0; j < scc->len; ++j)
+	TREE_ASM_WRITTEN (scc->entries[j]) = 0;
+    }
+
+  return false;
+}
+
+/* QSort sort function to sort a map of two pointers after the 2nd
+   pointer.  */
+
+static int
+cmp_tree (const void *p1_, const void *p2_)
+{
+  tree *p1 = (tree *)(const_cast<void *>(p1_));
+  tree *p2 = (tree *)(const_cast<void *>(p2_));
+  if (p1[1] == p2[1])
+    return 0;
+  return ((uintptr_t)p1[1] < (uintptr_t)p2[1]) ? -1 : 1;
+}
+
+/* Try to unify the SCC with nodes FROM to FROM + LEN in CACHE and
+   hash value SCC_HASH with an already recorded SCC.  Return true if
+   that was successful, otherwise return false.  */
+
+static bool
+unify_scc (struct data_in *data_in, unsigned from,
+	   unsigned len, unsigned scc_entry_len, hashval_t scc_hash)
+{
+  bool unified_p = false;
+  struct streamer_tree_cache_d *cache = data_in->reader_cache;
+  tree_scc *scc
+    = (tree_scc *) alloca (sizeof (tree_scc) + (len - 1) * sizeof (tree));
+  scc->next = NULL;
+  scc->hash = scc_hash;
+  scc->len = len;
+  scc->entry_len = scc_entry_len;
+  for (unsigned i = 0; i < len; ++i)
+    {
+      tree t = streamer_tree_cache_get_tree (cache, from + i);
+      scc->entries[i] = t;
+      /* Do not merge SCCs with local entities inside them.  Also do
+	 not merge TRANSLATION_UNIT_DECLs.  */
+      if (TREE_CODE (t) == TRANSLATION_UNIT_DECL
+	  || (VAR_OR_FUNCTION_DECL_P (t)
+	      && !(TREE_PUBLIC (t) || DECL_EXTERNAL (t)))
+	  || TREE_CODE (t) == LABEL_DECL)
+	{
+	  /* Avoid doing any work for these cases and do not worry to
+	     record the SCCs for further merging.  */
+	  return false;
+	}
+    }
+
+  /* Look for the list of candidate SCCs to compare against.  */
+  tree_scc **slot;
+  slot = tree_scc_hash->find_slot_with_hash (scc, scc_hash, INSERT);
+  if (*slot)
+    {
+      /* Try unifying against each candidate.  */
+      num_scc_compares++;
+
+      /* Set TREE_VISITED on the scc so we can easily identify tree nodes
+	 outside of the scc when following tree edges.  Make sure
+	 that TREE_ASM_WRITTEN is unset so we can use it as 2nd bit
+	 to track whether we visited the SCC member during the compare.
+	 We cannot use TREE_VISITED on the pscc members as the extended
+	 scc and pscc can overlap.  */
+      for (unsigned i = 0; i < scc->len; ++i)
+	{
+	  TREE_VISITED (scc->entries[i]) = 1;
+	  gcc_checking_assert (!TREE_ASM_WRITTEN (scc->entries[i]));
+	}
+
+      tree *map = XALLOCAVEC (tree, 2 * len);
+      for (tree_scc *pscc = *slot; pscc; pscc = pscc->next)
+	{
+	  if (!compare_tree_sccs (pscc, scc, map))
+	    continue;
+
+	  /* Found an equal SCC.  */
+	  unified_p = true;
+	  num_scc_compare_collisions--;
+	  num_sccs_merged++;
+	  total_scc_size_merged += len;
+
+	  if (flag_checking)
+	    for (unsigned i = 0; i < len; ++i)
+	      {
+		tree t = map[2*i+1];
+		enum tree_code code = TREE_CODE (t);
+		/* IDENTIFIER_NODEs should be singletons and are merged by the
+		   streamer.  The others should be singletons, too, and we
+		   should not merge them in any way.  */
+		gcc_assert (code != TRANSLATION_UNIT_DECL
+			    && code != IDENTIFIER_NODE);
+	      }
+
+	  /* Fixup the streamer cache with the prevailing nodes according
+	     to the tree node mapping computed by compare_tree_sccs.  */
+	  if (len == 1)
+	    {
+	      /* If we got a debug reference queued, see if the prevailing
+	         tree has a debug reference and if not, register the one
+		 for the tree we are about to throw away.  */
+	      if (dref_queue.length () == 1)
+		{
+		  dref_entry e = dref_queue.pop ();
+		  gcc_assert (e.decl
+			      == streamer_tree_cache_get_tree (cache, from));
+		  const char *sym;
+		  unsigned HOST_WIDE_INT off;
+		  if (!debug_hooks->die_ref_for_decl (pscc->entries[0], &sym,
+						      &off))
+		    debug_hooks->register_external_die (pscc->entries[0],
+							e.sym, e.off);
+		}
+	      lto_maybe_register_decl (data_in, pscc->entries[0], from);
+	      streamer_tree_cache_replace_tree (cache, pscc->entries[0], from);
+	    }
+	  else
+	    {
+	      tree *map2 = XALLOCAVEC (tree, 2 * len);
+	      for (unsigned i = 0; i < len; ++i)
+		{
+		  map2[i*2] = (tree)(uintptr_t)(from + i);
+		  map2[i*2+1] = scc->entries[i];
+		}
+	      qsort (map2, len, 2 * sizeof (tree), cmp_tree);
+	      qsort (map, len, 2 * sizeof (tree), cmp_tree);
+	      for (unsigned i = 0; i < len; ++i)
+		{
+		  lto_maybe_register_decl (data_in, map[2*i],
+					   (uintptr_t)map2[2*i]);
+		  streamer_tree_cache_replace_tree (cache, map[2*i],
+						    (uintptr_t)map2[2*i]);
+		}
+	    }
+
+	  /* Free the tree nodes from the read SCC.  */
+	  data_in->location_cache.revert_location_cache ();
+	  for (unsigned i = 0; i < len; ++i)
+	    {
+	      if (TYPE_P (scc->entries[i]))
+		num_merged_types++;
+	      free_node (scc->entries[i]);
+	    }
+
+	  /* Drop DIE references.
+	     ???  Do as in the size-one SCC case which involves sorting
+	     the queue.  */
+	  dref_queue.truncate (0);
+
+	  break;
+	}
+
+      /* Reset TREE_VISITED if we didn't unify the SCC with another.  */
+      if (!unified_p)
+	for (unsigned i = 0; i < scc->len; ++i)
+	  TREE_VISITED (scc->entries[i]) = 0;
+    }
+
+  /* If we didn't unify it to any candidate duplicate the relevant
+     pieces to permanent storage and link it into the chain.  */
+  if (!unified_p)
+    {
+      tree_scc *pscc
+	= XOBNEWVAR (&tree_scc_hash_obstack, tree_scc, sizeof (tree_scc));
+      memcpy (pscc, scc, sizeof (tree_scc));
+      pscc->next = (*slot);
+      *slot = pscc;
+    }
+  return unified_p;
+}
+
+
+/* Read all the symbols from buffer DATA, using descriptors in DECL_DATA.
+   RESOLUTIONS is the set of symbols picked by the linker (read from the
+   resolution file when the linker plugin is being used).  */
+
+static void
+lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
+		vec<ld_plugin_symbol_resolution_t> resolutions)
+{
+  const struct lto_decl_header *header = (const struct lto_decl_header *) data;
+  const int decl_offset = sizeof (struct lto_decl_header);
+  const int main_offset = decl_offset + header->decl_state_size;
+  const int string_offset = main_offset + header->main_size;
+  struct data_in *data_in;
+  unsigned int i;
+  const uint32_t *data_ptr, *data_end;
+  uint32_t num_decl_states;
+
+  lto_input_block ib_main ((const char *) data + main_offset,
+			   header->main_size, decl_data->mode_table);
+
+  data_in = lto_data_in_create (decl_data, (const char *) data + string_offset,
+				header->string_size, resolutions);
+
+  /* We do not uniquify the pre-loaded cache entries, those are middle-end
+     internal types that should not be merged.  */
+
+  /* Read the global declarations and types.  */
+  while (ib_main.p < ib_main.len)
+    {
+      tree t;
+      unsigned from = data_in->reader_cache->nodes.length ();
+      /* Read and uniquify SCCs as in the input stream.  */
+      enum LTO_tags tag = streamer_read_record_start (&ib_main);
+      if (tag == LTO_tree_scc)
+	{
+	  unsigned len_;
+	  unsigned scc_entry_len;
+	  hashval_t scc_hash = lto_input_scc (&ib_main, data_in, &len_,
+					      &scc_entry_len);
+	  unsigned len = data_in->reader_cache->nodes.length () - from;
+	  gcc_assert (len == len_);
+
+	  total_scc_size += len;
+	  num_sccs_read++;
+
+	  /* We have the special case of size-1 SCCs that are pre-merged
+	     by means of identifier and string sharing for example.
+	     ???  Maybe we should avoid streaming those as SCCs.  */
+	  tree first = streamer_tree_cache_get_tree (data_in->reader_cache,
+						     from);
+	  if (len == 1
+	      && (TREE_CODE (first) == IDENTIFIER_NODE
+		  || (TREE_CODE (first) == INTEGER_CST
+		      && !TREE_OVERFLOW (first))))
+	    continue;
+
+	  /* Try to unify the SCC with already existing ones.  */
+	  if (!flag_ltrans
+	      && unify_scc (data_in, from,
+			    len, scc_entry_len, scc_hash))
+	    continue;
+
+	  /* Tree merging failed, mark entries in location cache as
+	     permanent.  */
+	  data_in->location_cache.accept_location_cache ();
+
+	  bool seen_type = false;
+	  for (unsigned i = 0; i < len; ++i)
+	    {
+	      tree t = streamer_tree_cache_get_tree (data_in->reader_cache,
+						     from + i);
+	      /* Reconstruct the type variant and pointer-to/reference-to
+		 chains.  */
+	      if (TYPE_P (t))
+		{
+		  seen_type = true;
+		  num_prevailing_types++;
+		  lto_fixup_prevailing_type (t);
+
+		  /* Compute the canonical type of all types.
+		     Because SCC components are streamed in random (hash) order
+		     we may have encountered the type before while registering
+		     type canonical of a derived type in the same SCC.  */
+		  if (!TYPE_CANONICAL (t))
+		    gimple_register_canonical_type (t);
+		  if (TYPE_MAIN_VARIANT (t) == t && odr_type_p (t))
+		    register_odr_type (t);
+		}
+	      /* Link shared INTEGER_CSTs into TYPE_CACHED_VALUEs of its
+		 type which is also member of this SCC.  */
+	      if (TREE_CODE (t) == INTEGER_CST
+		  && !TREE_OVERFLOW (t))
+		cache_integer_cst (t);
+	      if (!flag_ltrans)
+		{
+		  lto_maybe_register_decl (data_in, t, from + i);
+		  /* Scan the tree for references to global functions or
+		     variables and record those for later fixup.  */
+		  if (mentions_vars_p (t))
+		    vec_safe_push (tree_with_vars, t);
+		}
+	    }
+
+	  /* Register DECLs with the debuginfo machinery.  */
+	  while (!dref_queue.is_empty ())
+	    {
+	      dref_entry e = dref_queue.pop ();
+	      debug_hooks->register_external_die (e.decl, e.sym, e.off);
+	    }
+
+	  if (seen_type)
+	    num_type_scc_trees += len;
+	}
+      else
+	{
+	  /* Pickle stray references.  */
+	  t = lto_input_tree_1 (&ib_main, data_in, tag, 0);
+	  gcc_assert (t && data_in->reader_cache->nodes.length () == from);
+	}
+    }
+  data_in->location_cache.apply_location_cache ();
+
+  /* Read in lto_in_decl_state objects.  */
+  data_ptr = (const uint32_t *) ((const char*) data + decl_offset); 
+  data_end =
+     (const uint32_t *) ((const char*) data_ptr + header->decl_state_size);
+  num_decl_states = *data_ptr++;
+  
+  gcc_assert (num_decl_states > 0);
+  decl_data->global_decl_state = lto_new_in_decl_state ();
+  data_ptr = lto_read_in_decl_state (data_in, data_ptr,
+				     decl_data->global_decl_state);
+
+  /* Read in per-function decl states and enter them in hash table.  */
+  decl_data->function_decl_states =
+    hash_table<decl_state_hasher>::create_ggc (37);
+
+  for (i = 1; i < num_decl_states; i++)
+    {
+      struct lto_in_decl_state *state = lto_new_in_decl_state ();
+
+      data_ptr = lto_read_in_decl_state (data_in, data_ptr, state);
+      lto_in_decl_state **slot
+	= decl_data->function_decl_states->find_slot (state, INSERT);
+      gcc_assert (*slot == NULL);
+      *slot = state;
+    }
+
+  if (data_ptr != data_end)
+    internal_error ("bytecode stream: garbage at the end of symbols section");
+
+  /* Set the current decl state to be the global state. */
+  decl_data->current_decl_state = decl_data->global_decl_state;
+
+  lto_data_in_delete (data_in);
+}
+
+/* Custom version of strtoll, which is not portable.  */
+
+static int64_t
+lto_parse_hex (const char *p)
+{
+  int64_t ret = 0;
+
+  for (; *p != '\0'; ++p)
+    {
+      char c = *p;
+      unsigned char part;
+      ret <<= 4;
+      if (c >= '0' && c <= '9')
+        part = c - '0';
+      else if (c >= 'a' && c <= 'f')
+        part = c - 'a' + 10;
+      else if (c >= 'A' && c <= 'F')
+        part = c - 'A' + 10;
+      else
+        internal_error ("could not parse hex number");
+      ret |= part;
+    }
+
+  return ret;
+}
+
+/* Read resolution for file named FILE_NAME. The resolution is read from
+   RESOLUTION. */
+
+static void
+lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
+{
+  /* We require that objects in the resolution file are in the same
+     order as the lto1 command line. */
+  unsigned int name_len;
+  char *obj_name;
+  unsigned int num_symbols;
+  unsigned int i;
+  struct lto_file_decl_data *file_data;
+  splay_tree_node nd = NULL; 
+
+  if (!resolution)
+    return;
+
+  name_len = strlen (file->filename);
+  obj_name = XNEWVEC (char, name_len + 1);
+  fscanf (resolution, " ");   /* Read white space. */
+
+  fread (obj_name, sizeof (char), name_len, resolution);
+  obj_name[name_len] = '\0';
+  if (filename_cmp (obj_name, file->filename) != 0)
+    internal_error ("unexpected file name %s in linker resolution file. "
+		    "Expected %s", obj_name, file->filename);
+  if (file->offset != 0)
+    {
+      int t;
+      char offset_p[17];
+      int64_t offset;
+      t = fscanf (resolution, "@0x%16s", offset_p);
+      if (t != 1)
+        internal_error ("could not parse file offset");
+      offset = lto_parse_hex (offset_p);
+      if (offset != file->offset)
+        internal_error ("unexpected offset");
+    }
+
+  free (obj_name);
+
+  fscanf (resolution, "%u", &num_symbols);
+
+  for (i = 0; i < num_symbols; i++)
+    {
+      int t;
+      unsigned index;
+      unsigned HOST_WIDE_INT id;
+      char r_str[27];
+      enum ld_plugin_symbol_resolution r = (enum ld_plugin_symbol_resolution) 0;
+      unsigned int j;
+      unsigned int lto_resolution_str_len =
+	sizeof (lto_resolution_str) / sizeof (char *);
+      res_pair rp;
+
+      t = fscanf (resolution, "%u " HOST_WIDE_INT_PRINT_HEX_PURE " %26s %*[^\n]\n", 
+		  &index, &id, r_str);
+      if (t != 3)
+        internal_error ("invalid line in the resolution file");
+
+      for (j = 0; j < lto_resolution_str_len; j++)
+	{
+	  if (strcmp (lto_resolution_str[j], r_str) == 0)
+	    {
+	      r = (enum ld_plugin_symbol_resolution) j;
+	      break;
+	    }
+	}
+      if (j == lto_resolution_str_len)
+	internal_error ("invalid resolution in the resolution file");
+
+      if (!(nd && lto_splay_tree_id_equal_p (nd->key, id)))
+	{
+	  nd = lto_splay_tree_lookup (file_ids, id);
+	  if (nd == NULL)
+	    internal_error ("resolution sub id %wx not in object file", id);
+	}
+
+      file_data = (struct lto_file_decl_data *)nd->value;
+      /* The indexes are very sparse. To save memory save them in a compact
+         format that is only unpacked later when the subfile is processed. */
+      rp.res = r;
+      rp.index = index;
+      file_data->respairs.safe_push (rp);
+      if (file_data->max_index < index)
+        file_data->max_index = index;
+    }
+}
+
+/* List of file_decl_datas */
+struct file_data_list
+  {
+    struct lto_file_decl_data *first, *last;
+  };
+
+/* Is the name for a id'ed LTO section? */
+
+static int 
+lto_section_with_id (const char *name, unsigned HOST_WIDE_INT *id)
+{
+  const char *s;
+
+  if (strncmp (name, section_name_prefix, strlen (section_name_prefix)))
+    return 0;
+  s = strrchr (name, '.');
+  if (!s)
+    return 0;
+  /* If the section is not suffixed with an ID return.  */
+  if ((size_t)(s - name) == strlen (section_name_prefix))
+    return 0;
+  return sscanf (s, "." HOST_WIDE_INT_PRINT_HEX_PURE, id) == 1;
+}
+
+/* Create file_data of each sub file id */
+
+static int 
+create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
+                            struct file_data_list *list)
+{
+  struct lto_section_slot s_slot, *new_slot;
+  unsigned HOST_WIDE_INT id;
+  splay_tree_node nd;
+  void **hash_slot;
+  char *new_name;
+  struct lto_file_decl_data *file_data;
+
+  if (!lto_section_with_id (ls->name, &id))
+    return 1;
+  
+  /* Find hash table of sub module id */
+  nd = lto_splay_tree_lookup (file_ids, id);
+  if (nd != NULL)
+    {
+      file_data = (struct lto_file_decl_data *)nd->value;
+    }
+  else
+    {
+      file_data = ggc_alloc<lto_file_decl_data> ();
+      memset(file_data, 0, sizeof (struct lto_file_decl_data));
+      file_data->id = id;
+      file_data->section_hash_table = lto_obj_create_section_hash_table ();
+      lto_splay_tree_insert (file_ids, id, file_data);
+
+      /* Maintain list in linker order */
+      if (!list->first)
+        list->first = file_data;
+      if (list->last)
+        list->last->next = file_data;
+      list->last = file_data;
+    }
+
+  /* Copy section into sub module hash table */
+  new_name = XDUPVEC (char, ls->name, strlen (ls->name) + 1);
+  s_slot.name = new_name;
+  hash_slot = htab_find_slot (file_data->section_hash_table, &s_slot, INSERT);
+  gcc_assert (*hash_slot == NULL);
+
+  new_slot = XDUP (struct lto_section_slot, ls);
+  new_slot->name = new_name;
+  *hash_slot = new_slot;
+  return 1;
+}
+
+/* Read declarations and other initializations for a FILE_DATA. */
+
+static void
+lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
+{
+  const char *data;
+  size_t len;
+  vec<ld_plugin_symbol_resolution_t>
+	resolutions = vNULL;
+  int i;
+  res_pair *rp;
+
+  /* Create vector for fast access of resolution. We do this lazily
+     to save memory. */ 
+  resolutions.safe_grow_cleared (file_data->max_index + 1);
+  for (i = 0; file_data->respairs.iterate (i, &rp); i++)
+    resolutions[rp->index] = rp->res;
+  file_data->respairs.release ();
+
+  file_data->renaming_hash_table = lto_create_renaming_table ();
+  file_data->file_name = file->filename;
+#ifdef ACCEL_COMPILER
+  lto_input_mode_table (file_data);
+#else
+  file_data->mode_table = lto_mode_identity_table;
+#endif
+  data = lto_get_section_data (file_data, LTO_section_decls, NULL, &len);
+  if (data == NULL)
+    {
+      internal_error ("cannot read LTO decls from %s", file_data->file_name);
+      return;
+    }
+  /* Frees resolutions */
+  lto_read_decls (file_data, data, resolutions);
+  lto_free_section_data (file_data, LTO_section_decls, NULL, data, len);
+}
+
+/* Finalize FILE_DATA in FILE and increase COUNT. */
+
+static int 
+lto_create_files_from_ids (lto_file *file, struct lto_file_decl_data *file_data,
+			   int *count)
+{
+  lto_file_finalize (file_data, file);
+  if (symtab->dump_file)
+    fprintf (symtab->dump_file,
+	     "Creating file %s with sub id " HOST_WIDE_INT_PRINT_HEX "\n",
+	     file_data->file_name, file_data->id);
+  (*count)++;
+  return 0;
+}
+
+/* Generate a TREE representation for all types and external decls
+   entities in FILE.  
+
+   Read all of the globals out of the file.  Then read the cgraph
+   and process the .o index into the cgraph nodes so that it can open
+   the .o file to load the functions and ipa information.   */
+
+static struct lto_file_decl_data *
+lto_file_read (lto_file *file, FILE *resolution_file, int *count)
+{
+  struct lto_file_decl_data *file_data = NULL;
+  splay_tree file_ids;
+  htab_t section_hash_table;
+  struct lto_section_slot *section;
+  struct file_data_list file_list;
+  struct lto_section_list section_list;
+ 
+  memset (&section_list, 0, sizeof (struct lto_section_list)); 
+  section_hash_table = lto_obj_build_section_table (file, &section_list);
+
+  /* Find all sub modules in the object and put their sections into new hash
+     tables in a splay tree. */
+  file_ids = lto_splay_tree_new ();
+  memset (&file_list, 0, sizeof (struct file_data_list));
+  for (section = section_list.first; section != NULL; section = section->next)
+    create_subid_section_table (section, file_ids, &file_list);
+
+  /* Add resolutions to file ids */
+  lto_resolution_read (file_ids, resolution_file, file);
+
+  /* Finalize each lto file for each submodule in the merged object */
+  for (file_data = file_list.first; file_data != NULL; file_data = file_data->next)
+    lto_create_files_from_ids (file, file_data, count);
+ 
+  splay_tree_delete (file_ids);
+  htab_delete (section_hash_table);
+
+  return file_list.first;
+}
+
+#if HAVE_MMAP_FILE && HAVE_SYSCONF && defined _SC_PAGE_SIZE
+#define LTO_MMAP_IO 1
+#endif
+
+#if LTO_MMAP_IO
+/* Page size of machine is used for mmap and munmap calls.  */
+static size_t page_mask;
+#endif
+
+/* Get the section data of length LEN from FILENAME starting at
+   OFFSET.  The data segment must be freed by the caller when the
+   caller is finished.  Returns NULL if all was not well.  */
+
+static char *
+lto_read_section_data (struct lto_file_decl_data *file_data,
+		       intptr_t offset, size_t len)
+{
+  char *result;
+  static int fd = -1;
+  static char *fd_name;
+#if LTO_MMAP_IO
+  intptr_t computed_len;
+  intptr_t computed_offset;
+  intptr_t diff;
+#endif
+
+  /* Keep a single-entry file-descriptor cache.  The last file we
+     touched will get closed at exit.
+     ???  Eventually we want to add a more sophisticated larger cache
+     or rather fix function body streaming to not stream them in
+     practically random order.  */
+  if (fd != -1
+      && filename_cmp (fd_name, file_data->file_name) != 0)
+    {
+      free (fd_name);
+      close (fd);
+      fd = -1;
+    }
+  if (fd == -1)
+    {
+      fd = open (file_data->file_name, O_RDONLY|O_BINARY);
+      if (fd == -1)
+        {
+	  fatal_error (input_location, "Cannot open %s", file_data->file_name);
+	  return NULL;
+        }
+      fd_name = xstrdup (file_data->file_name);
+    }
+
+#if LTO_MMAP_IO
+  if (!page_mask)
+    {
+      size_t page_size = sysconf (_SC_PAGE_SIZE);
+      page_mask = ~(page_size - 1);
+    }
+
+  computed_offset = offset & page_mask;
+  diff = offset - computed_offset;
+  computed_len = len + diff;
+
+  result = (char *) mmap (NULL, computed_len, PROT_READ, MAP_PRIVATE,
+			  fd, computed_offset);
+  if (result == MAP_FAILED)
+    {
+      fatal_error (input_location, "Cannot map %s", file_data->file_name);
+      return NULL;
+    }
+
+  return result + diff;
+#else
+  result = (char *) xmalloc (len);
+  if (lseek (fd, offset, SEEK_SET) != offset
+      || read (fd, result, len) != (ssize_t) len)
+    {
+      free (result);
+      fatal_error (input_location, "Cannot read %s", file_data->file_name);
+      result = NULL;
+    }
+#ifdef __MINGW32__
+  /* Native windows doesn't supports delayed unlink on opened file. So
+     we close file here again. This produces higher I/O load, but at least
+     it prevents to have dangling file handles preventing unlink.  */
+  free (fd_name);
+  fd_name = NULL;
+  close (fd);
+  fd = -1;
+#endif
+  return result;
+#endif
+}    
+
+
+/* Get the section data from FILE_DATA of SECTION_TYPE with NAME.
+   NAME will be NULL unless the section type is for a function
+   body.  */
+
+static const char *
+get_section_data (struct lto_file_decl_data *file_data,
+		      enum lto_section_type section_type,
+		      const char *name,
+		      size_t *len)
+{
+  htab_t section_hash_table = file_data->section_hash_table;
+  struct lto_section_slot *f_slot;
+  struct lto_section_slot s_slot;
+  const char *section_name = lto_get_section_name (section_type, name, file_data);
+  char *data = NULL;
+
+  *len = 0;
+  s_slot.name = section_name;
+  f_slot = (struct lto_section_slot *) htab_find (section_hash_table, &s_slot);
+  if (f_slot)
+    {
+      data = lto_read_section_data (file_data, f_slot->start, f_slot->len);
+      *len = f_slot->len;
+    }
+
+  free (CONST_CAST (char *, section_name));
+  return data;
+}
+
+
+/* Free the section data from FILE_DATA of SECTION_TYPE with NAME that
+   starts at OFFSET and has LEN bytes.  */
+
+static void
+free_section_data (struct lto_file_decl_data *file_data ATTRIBUTE_UNUSED,
+		   enum lto_section_type section_type ATTRIBUTE_UNUSED,
+		   const char *name ATTRIBUTE_UNUSED,
+		   const char *offset, size_t len ATTRIBUTE_UNUSED)
+{
+#if LTO_MMAP_IO
+  intptr_t computed_len;
+  intptr_t computed_offset;
+  intptr_t diff;
+#endif
+
+#if LTO_MMAP_IO
+  computed_offset = ((intptr_t) offset) & page_mask;
+  diff = (intptr_t) offset - computed_offset;
+  computed_len = len + diff;
+
+  munmap ((caddr_t) computed_offset, computed_len);
+#else
+  free (CONST_CAST(char *, offset));
+#endif
+}
+
+static lto_file *current_lto_file;
+
+/* If TT is a variable or function decl replace it with its
+   prevailing variant.  */
+#define LTO_SET_PREVAIL(tt) \
+  do {\
+    if ((tt) && VAR_OR_FUNCTION_DECL_P (tt) \
+	&& (TREE_PUBLIC (tt) || DECL_EXTERNAL (tt))) \
+      { \
+        tt = lto_symtab_prevailing_decl (tt); \
+	fixed = true; \
+      } \
+  } while (0)
+
+/* Ensure that TT isn't a replacable var of function decl.  */
+#define LTO_NO_PREVAIL(tt) \
+  gcc_checking_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt))
+
+/* Given a tree T replace all fields referring to variables or functions
+   with their prevailing variant.  */
+static void
+lto_fixup_prevailing_decls (tree t)
+{
+  enum tree_code code = TREE_CODE (t);
+  bool fixed = false;
+
+  gcc_checking_assert (code != TREE_BINFO);
+  LTO_NO_PREVAIL (TREE_TYPE (t));
+  if (CODE_CONTAINS_STRUCT (code, TS_COMMON)
+      /* lto_symtab_prevail_decl use TREE_CHAIN to link to the prevailing decl.
+	 in the case T is a prevailed declaration we would ICE here. */
+      && !VAR_OR_FUNCTION_DECL_P (t))
+    LTO_NO_PREVAIL (TREE_CHAIN (t));
+  if (DECL_P (t))
+    {
+      LTO_NO_PREVAIL (DECL_NAME (t));
+      LTO_SET_PREVAIL (DECL_CONTEXT (t));
+      if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
+	{
+	  LTO_SET_PREVAIL (DECL_SIZE (t));
+	  LTO_SET_PREVAIL (DECL_SIZE_UNIT (t));
+	  LTO_SET_PREVAIL (DECL_INITIAL (t));
+	  LTO_NO_PREVAIL (DECL_ATTRIBUTES (t));
+	  LTO_SET_PREVAIL (DECL_ABSTRACT_ORIGIN (t));
+	}
+      if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
+	{
+	  LTO_NO_PREVAIL (DECL_ASSEMBLER_NAME_RAW (t));
+	}
+      if (CODE_CONTAINS_STRUCT (code, TS_DECL_NON_COMMON))
+	{
+	  LTO_NO_PREVAIL (DECL_RESULT_FLD (t));
+	}
+      if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
+	{
+	  LTO_NO_PREVAIL (DECL_ARGUMENTS (t));
+	  LTO_SET_PREVAIL (DECL_FUNCTION_PERSONALITY (t));
+	  LTO_NO_PREVAIL (DECL_VINDEX (t));
+	}
+      if (CODE_CONTAINS_STRUCT (code, TS_FIELD_DECL))
+	{
+	  LTO_SET_PREVAIL (DECL_FIELD_OFFSET (t));
+	  LTO_NO_PREVAIL (DECL_BIT_FIELD_TYPE (t));
+	  LTO_NO_PREVAIL (DECL_QUALIFIER (t));
+	  LTO_NO_PREVAIL (DECL_FIELD_BIT_OFFSET (t));
+	  LTO_NO_PREVAIL (DECL_FCONTEXT (t));
+	}
+    }
+  else if (TYPE_P (t))
+    {
+      LTO_NO_PREVAIL (TYPE_CACHED_VALUES (t));
+      LTO_SET_PREVAIL (TYPE_SIZE (t));
+      LTO_SET_PREVAIL (TYPE_SIZE_UNIT (t));
+      LTO_NO_PREVAIL (TYPE_ATTRIBUTES (t));
+      LTO_NO_PREVAIL (TYPE_NAME (t));
+
+      LTO_SET_PREVAIL (TYPE_MIN_VALUE_RAW (t));
+      LTO_SET_PREVAIL (TYPE_MAX_VALUE_RAW (t));
+      LTO_NO_PREVAIL (TYPE_LANG_SLOT_1 (t));
+
+      LTO_SET_PREVAIL (TYPE_CONTEXT (t));
+
+      LTO_NO_PREVAIL (TYPE_CANONICAL (t));
+      LTO_NO_PREVAIL (TYPE_MAIN_VARIANT (t));
+      LTO_NO_PREVAIL (TYPE_NEXT_VARIANT (t));
+    }
+  else if (EXPR_P (t))
+    {
+      int i;
+      for (i = TREE_OPERAND_LENGTH (t) - 1; i >= 0; --i)
+	LTO_SET_PREVAIL (TREE_OPERAND (t, i));
+    }
+  else if (TREE_CODE (t) == CONSTRUCTOR)
+    {
+      unsigned i;
+      tree val;
+      FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (t), i, val)
+	LTO_SET_PREVAIL (val);
+    }
+  else
+    {
+      switch (code)
+	{
+	case TREE_LIST:
+	  LTO_SET_PREVAIL (TREE_VALUE (t));
+	  LTO_SET_PREVAIL (TREE_PURPOSE (t));
+	  LTO_NO_PREVAIL (TREE_PURPOSE (t));
+	  break;
+	default:
+	  gcc_unreachable ();
+	}
+    }
+  /* If we fixed nothing, then we missed something seen by
+     mentions_vars_p.  */
+  gcc_checking_assert (fixed);
+}
+#undef LTO_SET_PREVAIL
+#undef LTO_NO_PREVAIL
+
+/* Helper function of lto_fixup_decls. Walks the var and fn streams in STATE,
+   replaces var and function decls with the corresponding prevailing def.  */
+
+static void
+lto_fixup_state (struct lto_in_decl_state *state)
+{
+  unsigned i, si;
+
+  /* Although we only want to replace FUNCTION_DECLs and VAR_DECLs,
+     we still need to walk from all DECLs to find the reachable
+     FUNCTION_DECLs and VAR_DECLs.  */
+  for (si = 0; si < LTO_N_DECL_STREAMS; si++)
+    {
+      vec<tree, va_gc> *trees = state->streams[si];
+      for (i = 0; i < vec_safe_length (trees); i++)
+	{
+	  tree t = (*trees)[i];
+	  if (flag_checking && TYPE_P (t))
+	    verify_type (t);
+	  if (VAR_OR_FUNCTION_DECL_P (t)
+	      && (TREE_PUBLIC (t) || DECL_EXTERNAL (t)))
+	    (*trees)[i] = lto_symtab_prevailing_decl (t);
+	}
+    }
+}
+
+/* Fix the decls from all FILES. Replaces each decl with the corresponding
+   prevailing one.  */
+
+static void
+lto_fixup_decls (struct lto_file_decl_data **files)
+{
+  unsigned int i;
+  tree t;
+
+  if (tree_with_vars)
+    FOR_EACH_VEC_ELT ((*tree_with_vars), i, t)
+      lto_fixup_prevailing_decls (t);
+
+  for (i = 0; files[i]; i++)
+    {
+      struct lto_file_decl_data *file = files[i];
+      struct lto_in_decl_state *state = file->global_decl_state;
+      lto_fixup_state (state);
+
+      hash_table<decl_state_hasher>::iterator iter;
+      lto_in_decl_state *elt;
+      FOR_EACH_HASH_TABLE_ELEMENT (*file->function_decl_states, elt,
+				   lto_in_decl_state *, iter)
+	lto_fixup_state (elt);
+    }
+}
+
+static GTY((length ("lto_stats.num_input_files + 1"))) struct lto_file_decl_data **all_file_decl_data;
+
+/* Turn file datas for sub files into a single array, so that they look
+   like separate files for further passes. */
+
+static void
+lto_flatten_files (struct lto_file_decl_data **orig, int count, int last_file_ix)
+{
+  struct lto_file_decl_data *n, *next;
+  int i, k;
+
+  lto_stats.num_input_files = count;
+  all_file_decl_data
+    = ggc_cleared_vec_alloc<lto_file_decl_data_ptr> (count + 1);
+  /* Set the hooks so that all of the ipa passes can read in their data.  */
+  lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
+  for (i = 0, k = 0; i < last_file_ix; i++) 
+    {
+      for (n = orig[i]; n != NULL; n = next)
+	{
+	  all_file_decl_data[k++] = n;
+	  next = n->next;
+	  n->next = NULL;
+	}
+    }
+  all_file_decl_data[k] = NULL;
+  gcc_assert (k == count);
+}
+
+/* Input file data before flattening (i.e. splitting them to subfiles to support
+   incremental linking.  */
+static int real_file_count;
+static GTY((length ("real_file_count + 1"))) struct lto_file_decl_data **real_file_decl_data;
+
+/* Read all the symbols from the input files FNAMES.  NFILES is the
+   number of files requested in the command line.  Instantiate a
+   global call graph by aggregating all the sub-graphs found in each
+   file.  */
+
+void
+read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
+{
+  unsigned int i, last_file_ix;
+  FILE *resolution;
+  int count = 0;
+  struct lto_file_decl_data **decl_data;
+  symtab_node *snode;
+
+  symtab->initialize ();
+
+  timevar_push (TV_IPA_LTO_DECL_IN);
+
+#ifdef ACCEL_COMPILER
+  section_name_prefix = OFFLOAD_SECTION_NAME_PREFIX;
+  lto_stream_offload_p = true;
+#endif
+
+  real_file_decl_data
+    = decl_data = ggc_cleared_vec_alloc<lto_file_decl_data_ptr> (nfiles + 1);
+  real_file_count = nfiles;
+
+  /* Read the resolution file.  */
+  resolution = NULL;
+  if (resolution_file_name)
+    {
+      int t;
+      unsigned num_objects;
+
+      resolution = fopen (resolution_file_name, "r");
+      if (resolution == NULL)
+	fatal_error (input_location,
+		     "could not open symbol resolution file: %m");
+
+      t = fscanf (resolution, "%u", &num_objects);
+      gcc_assert (t == 1);
+
+      /* True, since the plugin splits the archives.  */
+      gcc_assert (num_objects == nfiles);
+    }
+  symtab->state = LTO_STREAMING;
+
+  canonical_type_hash_cache = new hash_map<const_tree, hashval_t> (251);
+  gimple_canonical_types = htab_create (16381, gimple_canonical_type_hash,
+					gimple_canonical_type_eq, NULL);
+  gcc_obstack_init (&tree_scc_hash_obstack);
+  tree_scc_hash = new hash_table<tree_scc_hasher> (4096);
+
+  /* Register the common node types with the canonical type machinery so
+     we properly share alias-sets across languages and TUs.  Do not
+     expose the common nodes as type merge target - those that should be
+     are already exposed so by pre-loading the LTO streamer caches.
+     Do two passes - first clear TYPE_CANONICAL and then re-compute it.  */
+  for (i = 0; i < itk_none; ++i)
+    lto_register_canonical_types (integer_types[i], true);
+  for (i = 0; i < stk_type_kind_last; ++i)
+    lto_register_canonical_types (sizetype_tab[i], true);
+  for (i = 0; i < TI_MAX; ++i)
+    lto_register_canonical_types (global_trees[i], true);
+  for (i = 0; i < itk_none; ++i)
+    lto_register_canonical_types (integer_types[i], false);
+  for (i = 0; i < stk_type_kind_last; ++i)
+    lto_register_canonical_types (sizetype_tab[i], false);
+  for (i = 0; i < TI_MAX; ++i)
+    lto_register_canonical_types (global_trees[i], false);
+
+  if (!quiet_flag)
+    fprintf (stderr, "Reading object files:");
+
+  /* Read all of the object files specified on the command line.  */
+  for (i = 0, last_file_ix = 0; i < nfiles; ++i)
+    {
+      struct lto_file_decl_data *file_data = NULL;
+      if (!quiet_flag)
+	{
+	  fprintf (stderr, " %s", fnames[i]);
+	  fflush (stderr);
+	}
+
+      current_lto_file = lto_obj_file_open (fnames[i], false);
+      if (!current_lto_file)
+	break;
+
+      file_data = lto_file_read (current_lto_file, resolution, &count);
+      if (!file_data)
+	{
+	  lto_obj_file_close (current_lto_file);
+	  free (current_lto_file);
+	  current_lto_file = NULL;
+	  break;
+	}
+
+      decl_data[last_file_ix++] = file_data;
+
+      lto_obj_file_close (current_lto_file);
+      free (current_lto_file);
+      current_lto_file = NULL;
+    }
+
+  lto_flatten_files (decl_data, count, last_file_ix);
+  lto_stats.num_input_files = count;
+  ggc_free(decl_data);
+  real_file_decl_data = NULL;
+
+  if (resolution_file_name)
+    fclose (resolution);
+
+  /* Show the LTO report before launching LTRANS.  */
+  if (flag_lto_report || (flag_wpa && flag_lto_report_wpa))
+    print_lto_report_1 ();
+
+  /* Free gimple type merging datastructures.  */
+  delete tree_scc_hash;
+  tree_scc_hash = NULL;
+  obstack_free (&tree_scc_hash_obstack, NULL);
+  htab_delete (gimple_canonical_types);
+  gimple_canonical_types = NULL;
+  delete canonical_type_hash_cache;
+  canonical_type_hash_cache = NULL;
+
+  /* At this stage we know that majority of GGC memory is reachable.  
+     Growing the limits prevents unnecesary invocation of GGC.  */
+  ggc_grow ();
+  ggc_collect ();
+
+  /* Set the hooks so that all of the ipa passes can read in their data.  */
+  lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
+
+  timevar_pop (TV_IPA_LTO_DECL_IN);
+
+  if (!quiet_flag)
+    fprintf (stderr, "\nReading the callgraph\n");
+
+  timevar_push (TV_IPA_LTO_CGRAPH_IO);
+  /* Read the symtab.  */
+  input_symtab ();
+
+  input_offload_tables (!flag_ltrans);
+
+  /* Store resolutions into the symbol table.  */
+
+  FOR_EACH_SYMBOL (snode)
+    if (snode->externally_visible && snode->real_symbol_p ()
+	&& snode->lto_file_data && snode->lto_file_data->resolution_map
+	&& !(TREE_CODE (snode->decl) == FUNCTION_DECL
+	     && fndecl_built_in_p (snode->decl))
+	&& !(VAR_P (snode->decl) && DECL_HARD_REGISTER (snode->decl)))
+      {
+	ld_plugin_symbol_resolution_t *res;
+
+	res = snode->lto_file_data->resolution_map->get (snode->decl);
+	if (!res || *res == LDPR_UNKNOWN)
+	  {
+	    if (snode->output_to_lto_symbol_table_p ())
+	      fatal_error (input_location, "missing resolution data for %s",
+		           IDENTIFIER_POINTER
+			     (DECL_ASSEMBLER_NAME (snode->decl)));
+	  }
+	else
+          snode->resolution = *res;
+      }
+  for (i = 0; all_file_decl_data[i]; i++)
+    if (all_file_decl_data[i]->resolution_map)
+      {
+        delete all_file_decl_data[i]->resolution_map;
+        all_file_decl_data[i]->resolution_map = NULL;
+      }
+  
+  timevar_pop (TV_IPA_LTO_CGRAPH_IO);
+
+  if (!quiet_flag)
+    fprintf (stderr, "Merging declarations\n");
+
+  timevar_push (TV_IPA_LTO_DECL_MERGE);
+  /* Merge global decls.  In ltrans mode we read merged cgraph, we do not
+     need to care about resolving symbols again, we only need to replace
+     duplicated declarations read from the callgraph and from function
+     sections.  */
+  if (!flag_ltrans)
+    {
+      lto_symtab_merge_decls ();
+
+      /* If there were errors during symbol merging bail out, we have no
+	 good way to recover here.  */
+      if (seen_error ())
+	fatal_error (input_location,
+		     "errors during merging of translation units");
+
+      /* Fixup all decls.  */
+      lto_fixup_decls (all_file_decl_data);
+    }
+  if (tree_with_vars)
+    ggc_free (tree_with_vars);
+  tree_with_vars = NULL;
+  ggc_collect ();
+
+  timevar_pop (TV_IPA_LTO_DECL_MERGE);
+  /* Each pass will set the appropriate timer.  */
+
+  if (!quiet_flag)
+    fprintf (stderr, "Reading summaries\n");
+
+  /* Read the IPA summary data.  */
+  if (flag_ltrans)
+    ipa_read_optimization_summaries ();
+  else
+    ipa_read_summaries ();
+
+  for (i = 0; all_file_decl_data[i]; i++)
+    {
+      gcc_assert (all_file_decl_data[i]->symtab_node_encoder);
+      lto_symtab_encoder_delete (all_file_decl_data[i]->symtab_node_encoder);
+      all_file_decl_data[i]->symtab_node_encoder = NULL;
+      lto_free_function_in_decl_state (all_file_decl_data[i]->global_decl_state);
+      all_file_decl_data[i]->global_decl_state = NULL;
+      all_file_decl_data[i]->current_decl_state = NULL; 
+    }
+
+  if (!flag_ltrans)
+    {
+      /* Finally merge the cgraph according to the decl merging decisions.  */
+      timevar_push (TV_IPA_LTO_CGRAPH_MERGE);
+
+      gcc_assert (!dump_file);
+      dump_file = dump_begin (lto_link_dump_id, NULL);
+
+      if (dump_file)
+	{
+	  fprintf (dump_file, "Before merging:\n");
+	  symtab->dump (dump_file);
+	}
+      lto_symtab_merge_symbols ();
+      /* Removal of unreachable symbols is needed to make verify_symtab to pass;
+	 we are still having duplicated comdat groups containing local statics.
+	 We could also just remove them while merging.  */
+      symtab->remove_unreachable_nodes (dump_file);
+      ggc_collect ();
+
+      if (dump_file)
+        dump_end (lto_link_dump_id, dump_file);
+      dump_file = NULL;
+      timevar_pop (TV_IPA_LTO_CGRAPH_MERGE);
+    }
+  symtab->state = IPA_SSA;
+  /* All node removals happening here are useless, because
+     WPA should not stream them.  Still always perform remove_unreachable_nodes
+     because we may reshape clone tree, get rid of dead masters of inline
+     clones and remove symbol entries for read-only variables we keep around
+     only to be able to constant fold them.  */
+  if (flag_ltrans)
+    {
+      if (symtab->dump_file)
+	 symtab->dump (symtab->dump_file);
+      symtab->remove_unreachable_nodes (symtab->dump_file);
+    }
+
+  /* Indicate that the cgraph is built and ready.  */
+  symtab->function_flags_ready = true;
+
+  ggc_free (all_file_decl_data);
+  all_file_decl_data = NULL;
+}
+
+
+
+/* Show various memory usage statistics related to LTO.  */
+void
+print_lto_report_1 (void)
+{
+  const char *pfx = (flag_lto) ? "LTO" : (flag_wpa) ? "WPA" : "LTRANS";
+  fprintf (stderr, "%s statistics\n", pfx);
+
+  fprintf (stderr, "[%s] read %lu SCCs of average size %f\n",
+	   pfx, num_sccs_read, total_scc_size / (double)num_sccs_read);
+  fprintf (stderr, "[%s] %lu tree bodies read in total\n", pfx, total_scc_size);
+  if (flag_wpa && tree_scc_hash)
+    {
+      fprintf (stderr, "[%s] tree SCC table: size %ld, %ld elements, "
+	       "collision ratio: %f\n", pfx,
+	       (long) tree_scc_hash->size (),
+	       (long) tree_scc_hash->elements (),
+	       tree_scc_hash->collisions ());
+      hash_table<tree_scc_hasher>::iterator hiter;
+      tree_scc *scc, *max_scc = NULL;
+      unsigned max_length = 0;
+      FOR_EACH_HASH_TABLE_ELEMENT (*tree_scc_hash, scc, x, hiter)
+	{
+	  unsigned length = 0;
+	  tree_scc *s = scc;
+	  for (; s; s = s->next)
+	    length++;
+	  if (length > max_length)
+	    {
+	      max_length = length;
+	      max_scc = scc;
+	    }
+	}
+      fprintf (stderr, "[%s] tree SCC max chain length %u (size %u)\n",
+	       pfx, max_length, max_scc->len);
+      fprintf (stderr, "[%s] Compared %lu SCCs, %lu collisions (%f)\n", pfx,
+	       num_scc_compares, num_scc_compare_collisions,
+	       num_scc_compare_collisions / (double) num_scc_compares);
+      fprintf (stderr, "[%s] Merged %lu SCCs\n", pfx, num_sccs_merged);
+      fprintf (stderr, "[%s] Merged %lu tree bodies\n", pfx,
+	       total_scc_size_merged);
+      fprintf (stderr, "[%s] Merged %lu types\n", pfx, num_merged_types);
+      fprintf (stderr, "[%s] %lu types prevailed (%lu associated trees)\n",
+	       pfx, num_prevailing_types, num_type_scc_trees);
+      fprintf (stderr, "[%s] GIMPLE canonical type table: size %ld, "
+	       "%ld elements, %ld searches, %ld collisions (ratio: %f)\n", pfx,
+	       (long) htab_size (gimple_canonical_types),
+	       (long) htab_elements (gimple_canonical_types),
+	       (long) gimple_canonical_types->searches,
+	       (long) gimple_canonical_types->collisions,
+	       htab_collisions (gimple_canonical_types));
+      fprintf (stderr, "[%s] GIMPLE canonical type pointer-map: "
+	       "%lu elements, %ld searches\n", pfx,
+	       num_canonical_type_hash_entries,
+	       num_canonical_type_hash_queries);
+    }
+
+  print_lto_report (pfx);
+}
+
+GTY(()) tree lto_eh_personality_decl;
+
+/* Return the LTO personality function decl.  */
+
+tree
+lto_eh_personality (void)
+{
+  if (!lto_eh_personality_decl)
+    {
+      /* Use the first personality DECL for our personality if we don't
+	 support multiple ones.  This ensures that we don't artificially
+	 create the need for them in a single-language program.  */
+      if (first_personality_decl && !dwarf2out_do_cfi_asm ())
+	lto_eh_personality_decl = first_personality_decl;
+      else
+	lto_eh_personality_decl = lhd_gcc_personality ();
+    }
+
+  return lto_eh_personality_decl;
+}
+
+/* Set the process name based on the LTO mode. */
+
+static void 
+lto_process_name (void)
+{
+  if (flag_lto)
+    setproctitle (flag_incremental_link == INCREMENTAL_LINK_LTO
+		  ? "lto1-inclink" : "lto1-lto");
+  if (flag_wpa)
+    setproctitle ("lto1-wpa");
+  if (flag_ltrans)
+    setproctitle ("lto1-ltrans");
+}
+
+
+/* Initialize the LTO front end.  */
+
+void
+lto_fe_init (void)
+{
+  lto_process_name ();
+  lto_streamer_hooks_init ();
+  lto_reader_init ();
+  lto_set_in_hooks (NULL, get_section_data, free_section_data);
+  memset (&lto_stats, 0, sizeof (lto_stats));
+  bitmap_obstack_initialize (NULL);
+  gimple_register_cfg_hooks ();
+#ifndef ACCEL_COMPILER
+  unsigned char *table
+    = ggc_vec_alloc<unsigned char> (MAX_MACHINE_MODE);
+  for (int m = 0; m < MAX_MACHINE_MODE; m++)
+    table[m] = m;
+  lto_mode_identity_table = table;
+#endif
+}
+
+#include "gt-lto-lto-common.h"
diff --git a/gcc/lto/lto-common.h b/gcc/lto/lto-common.h
new file mode 100644
index 00000000000..b1209a3a305
--- /dev/null
+++ b/gcc/lto/lto-common.h
@@ -0,0 +1,33 @@
+/* LTO common functions between lto.c and lto-dump.c header file.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef LTO_COMMON_H
+#define LTO_COMMON_H
+
+void lto_fe_init (void);
+void read_cgraph_and_symbols (unsigned, const char **);
+void print_lto_report_1 (void);
+
+extern tree lto_eh_personality_decl;
+extern GTY(()) vec<tree, va_gc> *tree_with_vars;
+extern const unsigned char *lto_mode_identity_table;
+extern tree first_personality_decl;
+
+#endif
+
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 5a35d4794c2..b88ca09d102 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "debug.h"
 #include "lto-tree.h"
 #include "lto.h"
+#include "lto-common.h"
 #include "stringpool.h"
 #include "attribs.h"
 
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index bb332f8221c..55d5554f18e 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "symbol-summary.h"
 #include "tree-vrp.h"
 #include "ipa-prop.h"
-#include "common.h"
 #include "debug.h"
 #include "lto.h"
 #include "lto-section-names.h"
@@ -55,122 +54,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "attribs.h"
 #include "builtins.h"
+#include "lto-common.h"
 
 
 /* Number of parallel tasks to run, -1 if we want to use GNU Make jobserver.  */
 static int lto_parallelism;
 
-static GTY(()) tree first_personality_decl;
-
-static GTY(()) const unsigned char *lto_mode_identity_table;
-
-/* Returns a hash code for P.  */
-
-static hashval_t
-hash_name (const void *p)
-{
-  const struct lto_section_slot *ds = (const struct lto_section_slot *) p;
-  return (hashval_t) htab_hash_string (ds->name);
-}
-
-
-/* Returns nonzero if P1 and P2 are equal.  */
-
-static int
-eq_name (const void *p1, const void *p2)
-{
-  const struct lto_section_slot *s1 =
-    (const struct lto_section_slot *) p1;
-  const struct lto_section_slot *s2 =
-    (const struct lto_section_slot *) p2;
-
-  return strcmp (s1->name, s2->name) == 0;
-}
-
-/* Free lto_section_slot */
-
-static void
-free_with_string (void *arg)
-{
-  struct lto_section_slot *s = (struct lto_section_slot *)arg;
-
-  free (CONST_CAST (char *, s->name));
-  free (arg);
-}
-
-/* Create section hash table */
-
-htab_t 
-lto_obj_create_section_hash_table (void)
-{
-  return htab_create (37, hash_name, eq_name, free_with_string);
-}
-
-/* Delete an allocated integer KEY in the splay tree.  */
-
-static void
-lto_splay_tree_delete_id (splay_tree_key key)
-{
-  free ((void *) key);
-}
-
-/* Compare splay tree node ids A and B.  */
-
-static int
-lto_splay_tree_compare_ids (splay_tree_key a, splay_tree_key b)
-{
-  unsigned HOST_WIDE_INT ai;
-  unsigned HOST_WIDE_INT bi;
-
-  ai = *(unsigned HOST_WIDE_INT *) a;
-  bi = *(unsigned HOST_WIDE_INT *) b;
-
-  if (ai < bi)
-    return -1;
-  else if (ai > bi)
-    return 1;
-  return 0;
-}
-
-/* Look up splay tree node by ID in splay tree T.  */
-
-static splay_tree_node
-lto_splay_tree_lookup (splay_tree t, unsigned HOST_WIDE_INT id)
-{
-  return splay_tree_lookup (t, (splay_tree_key) &id);
-}
-
-/* Check if KEY has ID.  */
-
-static bool
-lto_splay_tree_id_equal_p (splay_tree_key key, unsigned HOST_WIDE_INT id)
-{
-  return *(unsigned HOST_WIDE_INT *) key == id;
-}
-
-/* Insert a splay tree node into tree T with ID as key and FILE_DATA as value. 
-   The ID is allocated separately because we need HOST_WIDE_INTs which may
-   be wider than a splay_tree_key. */
-
-static void
-lto_splay_tree_insert (splay_tree t, unsigned HOST_WIDE_INT id,
-		       struct lto_file_decl_data *file_data)
-{
-  unsigned HOST_WIDE_INT *idp = XCNEW (unsigned HOST_WIDE_INT);
-  *idp = id;
-  splay_tree_insert (t, (splay_tree_key) idp, (splay_tree_value) file_data);
-}
-
-/* Create a splay tree.  */
-
-static splay_tree
-lto_splay_tree_new (void)
-{
-  return splay_tree_new (lto_splay_tree_compare_ids,
-	 	         lto_splay_tree_delete_id,
-			 NULL);
-}
-
 /* Return true when NODE has a clone that is analyzed (i.e. we need
    to load its body even if the node itself is not needed).  */
 
@@ -224,2083 +113,45 @@ lto_materialize_function (struct cgraph_node *node)
   rest_of_decl_compilation (decl, 1, 0);
 }
 
-
-/* Decode the content of memory pointed to by DATA in the in decl
-   state object STATE. DATA_IN points to a data_in structure for
-   decoding. Return the address after the decoded object in the
-   input.  */
-
-static const uint32_t *
-lto_read_in_decl_state (struct data_in *data_in, const uint32_t *data,
-			struct lto_in_decl_state *state)
-{
-  uint32_t ix;
-  tree decl;
-  uint32_t i, j;
-
-  ix = *data++;
-  state->compressed = ix & 1;
-  ix /= 2;
-  decl = streamer_tree_cache_get_tree (data_in->reader_cache, ix);
-  if (!VAR_OR_FUNCTION_DECL_P (decl))
-    {
-      gcc_assert (decl == void_type_node);
-      decl = NULL_TREE;
-    }
-  state->fn_decl = decl;
-
-  for (i = 0; i < LTO_N_DECL_STREAMS; i++)
-    {
-      uint32_t size = *data++;
-      vec<tree, va_gc> *decls = NULL;
-      vec_alloc (decls, size);
-
-      for (j = 0; j < size; j++)
-	vec_safe_push (decls,
-		       streamer_tree_cache_get_tree (data_in->reader_cache,
-						     data[j]));
-
-      state->streams[i] = decls;
-      data += size;
-    }
-
-  return data;
-}
-
-
-/* Global canonical type table.  */
-static htab_t gimple_canonical_types;
-static hash_map<const_tree, hashval_t> *canonical_type_hash_cache;
-static unsigned long num_canonical_type_hash_entries;
-static unsigned long num_canonical_type_hash_queries;
-
-static void iterative_hash_canonical_type (tree type, inchash::hash &hstate);
-static hashval_t gimple_canonical_type_hash (const void *p);
-static void gimple_register_canonical_type_1 (tree t, hashval_t hash);
-
-/* Returning a hash value for gimple type TYPE.
-
-   The hash value returned is equal for types considered compatible
-   by gimple_canonical_types_compatible_p.  */
-
-static hashval_t
-hash_canonical_type (tree type)
-{
-  inchash::hash hstate;
-  enum tree_code code;
-
-  /* We compute alias sets only for types that needs them.
-     Be sure we do not recurse to something else as we cannot hash incomplete
-     types in a way they would have same hash value as compatible complete
-     types.  */
-  gcc_checking_assert (type_with_alias_set_p (type));
-
-  /* Combine a few common features of types so that types are grouped into
-     smaller sets; when searching for existing matching types to merge,
-     only existing types having the same features as the new type will be
-     checked.  */
-  code = tree_code_for_canonical_type_merging (TREE_CODE (type));
-  hstate.add_int (code);
-  hstate.add_int (TYPE_MODE (type));
-
-  /* Incorporate common features of numerical types.  */
-  if (INTEGRAL_TYPE_P (type)
-      || SCALAR_FLOAT_TYPE_P (type)
-      || FIXED_POINT_TYPE_P (type)
-      || TREE_CODE (type) == OFFSET_TYPE
-      || POINTER_TYPE_P (type))
-    {
-      hstate.add_int (TYPE_PRECISION (type));
-      if (!type_with_interoperable_signedness (type))
-        hstate.add_int (TYPE_UNSIGNED (type));
-    }
-
-  if (VECTOR_TYPE_P (type))
-    {
-      hstate.add_poly_int (TYPE_VECTOR_SUBPARTS (type));
-      hstate.add_int (TYPE_UNSIGNED (type));
-    }
-
-  if (TREE_CODE (type) == COMPLEX_TYPE)
-    hstate.add_int (TYPE_UNSIGNED (type));
-
-  /* Fortran's C_SIGNED_CHAR is !TYPE_STRING_FLAG but needs to be
-     interoperable with "signed char".  Unless all frontends are revisited to
-     agree on these types, we must ignore the flag completely.  */
-
-  /* Fortran standard define C_PTR type that is compatible with every
-     C pointer.  For this reason we need to glob all pointers into one.
-     Still pointers in different address spaces are not compatible.  */
-  if (POINTER_TYPE_P (type))
-    hstate.add_int (TYPE_ADDR_SPACE (TREE_TYPE (type)));
-
-  /* For array types hash the domain bounds and the string flag.  */
-  if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type))
-    {
-      hstate.add_int (TYPE_STRING_FLAG (type));
-      /* OMP lowering can introduce error_mark_node in place of
-	 random local decls in types.  */
-      if (TYPE_MIN_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
-	inchash::add_expr (TYPE_MIN_VALUE (TYPE_DOMAIN (type)), hstate);
-      if (TYPE_MAX_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
-	inchash::add_expr (TYPE_MAX_VALUE (TYPE_DOMAIN (type)), hstate);
-    }
-
-  /* Recurse for aggregates with a single element type.  */
-  if (TREE_CODE (type) == ARRAY_TYPE
-      || TREE_CODE (type) == COMPLEX_TYPE
-      || TREE_CODE (type) == VECTOR_TYPE)
-    iterative_hash_canonical_type (TREE_TYPE (type), hstate);
-
-  /* Incorporate function return and argument types.  */
-  if (TREE_CODE (type) == FUNCTION_TYPE || TREE_CODE (type) == METHOD_TYPE)
-    {
-      unsigned na;
-      tree p;
-
-      iterative_hash_canonical_type (TREE_TYPE (type), hstate);
-
-      for (p = TYPE_ARG_TYPES (type), na = 0; p; p = TREE_CHAIN (p))
-	{
-	  iterative_hash_canonical_type (TREE_VALUE (p), hstate);
-	  na++;
-	}
-
-      hstate.add_int (na);
-    }
-
-  if (RECORD_OR_UNION_TYPE_P (type))
-    {
-      unsigned nf;
-      tree f;
-
-      for (f = TYPE_FIELDS (type), nf = 0; f; f = TREE_CHAIN (f))
-	if (TREE_CODE (f) == FIELD_DECL
-	    && (! DECL_SIZE (f)
-		|| ! integer_zerop (DECL_SIZE (f))))
-	  {
-	    iterative_hash_canonical_type (TREE_TYPE (f), hstate);
-	    nf++;
-	  }
-
-      hstate.add_int (nf);
-    }
-
-  return hstate.end();
-}
-
-/* Returning a hash value for gimple type TYPE combined with VAL.  */
-
-static void
-iterative_hash_canonical_type (tree type, inchash::hash &hstate)
-{
-  hashval_t v;
-
-  /* All type variants have same TYPE_CANONICAL.  */
-  type = TYPE_MAIN_VARIANT (type);
-
-  if (!canonical_type_used_p (type))
-    v = hash_canonical_type (type);
-  /* An already processed type.  */
-  else if (TYPE_CANONICAL (type))
-    {
-      type = TYPE_CANONICAL (type);
-      v = gimple_canonical_type_hash (type);
-    }
-  else
-    {
-      /* Canonical types should not be able to form SCCs by design, this
-	 recursion is just because we do not register canonical types in
-	 optimal order.  To avoid quadratic behavior also register the
-	 type here.  */
-      v = hash_canonical_type (type);
-      gimple_register_canonical_type_1 (type, v);
-    }
-  hstate.add_int (v);
-}
-
-/* Returns the hash for a canonical type P.  */
-
-static hashval_t
-gimple_canonical_type_hash (const void *p)
-{
-  num_canonical_type_hash_queries++;
-  hashval_t *slot = canonical_type_hash_cache->get ((const_tree) p);
-  gcc_assert (slot != NULL);
-  return *slot;
-}
-
-
-
-/* Returns nonzero if P1 and P2 are equal.  */
-
-static int
-gimple_canonical_type_eq (const void *p1, const void *p2)
-{
-  const_tree t1 = (const_tree) p1;
-  const_tree t2 = (const_tree) p2;
-  return gimple_canonical_types_compatible_p (CONST_CAST_TREE (t1),
-					      CONST_CAST_TREE (t2));
-}
-
-/* Main worker for gimple_register_canonical_type.  */
-
-static void
-gimple_register_canonical_type_1 (tree t, hashval_t hash)
-{
-  void **slot;
-
-  gcc_checking_assert (TYPE_P (t) && !TYPE_CANONICAL (t)
-		       && type_with_alias_set_p (t)
-		       && canonical_type_used_p (t));
-
-  slot = htab_find_slot_with_hash (gimple_canonical_types, t, hash, INSERT);
-  if (*slot)
-    {
-      tree new_type = (tree)(*slot);
-      gcc_checking_assert (new_type != t);
-      TYPE_CANONICAL (t) = new_type;
-    }
-  else
-    {
-      TYPE_CANONICAL (t) = t;
-      *slot = (void *) t;
-      /* Cache the just computed hash value.  */
-      num_canonical_type_hash_entries++;
-      bool existed_p = canonical_type_hash_cache->put (t, hash);
-      gcc_assert (!existed_p);
-    }
-}
-
-/* Register type T in the global type table gimple_types and set
-   TYPE_CANONICAL of T accordingly.
-   This is used by LTO to merge structurally equivalent types for
-   type-based aliasing purposes across different TUs and languages.
-
-   ???  This merging does not exactly match how the tree.c middle-end
-   functions will assign TYPE_CANONICAL when new types are created
-   during optimization (which at least happens for pointer and array
-   types).  */
-
-static void
-gimple_register_canonical_type (tree t)
-{
-  if (TYPE_CANONICAL (t) || !type_with_alias_set_p (t)
-      || !canonical_type_used_p (t))
-    return;
-
-  /* Canonical types are same among all complete variants.  */
-  if (TYPE_CANONICAL (TYPE_MAIN_VARIANT (t)))
-    TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
-  else
-    {
-      gimple_register_canonical_type_1 (TYPE_MAIN_VARIANT (t),
-					hash_canonical_type (TYPE_MAIN_VARIANT (t)));
-      TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
-    }
-}
-
-/* Re-compute TYPE_CANONICAL for NODE and related types.  */
+/* Materialize all the bodies for all the nodes in the callgraph.  */
 
 static void
-lto_register_canonical_types (tree node, bool first_p)
-{
-  if (!node
-      || !TYPE_P (node))
-    return;
-
-  if (first_p)
-    TYPE_CANONICAL (node) = NULL_TREE;
-
-  if (POINTER_TYPE_P (node)
-      || TREE_CODE (node) == COMPLEX_TYPE
-      || TREE_CODE (node) == ARRAY_TYPE)
-    lto_register_canonical_types (TREE_TYPE (node), first_p);
-
- if (!first_p) 
-    gimple_register_canonical_type (node);
-}
-
-
-/* Remember trees that contains references to declarations.  */
-static GTY(()) vec <tree, va_gc> *tree_with_vars;
-
-#define CHECK_VAR(tt) \
-  do \
-    { \
-      if ((tt) && VAR_OR_FUNCTION_DECL_P (tt) \
-	  && (TREE_PUBLIC (tt) || DECL_EXTERNAL (tt))) \
-	return true; \
-    } while (0)
-
-#define CHECK_NO_VAR(tt) \
-  gcc_checking_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt))
-
-/* Check presence of pointers to decls in fields of a tree_typed T.  */
-
-static inline bool
-mentions_vars_p_typed (tree t)
-{
-  CHECK_NO_VAR (TREE_TYPE (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a tree_common T.  */
-
-static inline bool
-mentions_vars_p_common (tree t)
-{
-  if (mentions_vars_p_typed (t))
-    return true;
-  CHECK_NO_VAR (TREE_CHAIN (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a decl_minimal T.  */
-
-static inline bool
-mentions_vars_p_decl_minimal (tree t)
-{
-  if (mentions_vars_p_common (t))
-    return true;
-  CHECK_NO_VAR (DECL_NAME (t));
-  CHECK_VAR (DECL_CONTEXT (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a decl_common T.  */
-
-static inline bool
-mentions_vars_p_decl_common (tree t)
-{
-  if (mentions_vars_p_decl_minimal (t))
-    return true;
-  CHECK_VAR (DECL_SIZE (t));
-  CHECK_VAR (DECL_SIZE_UNIT (t));
-  CHECK_VAR (DECL_INITIAL (t));
-  CHECK_NO_VAR (DECL_ATTRIBUTES (t));
-  CHECK_VAR (DECL_ABSTRACT_ORIGIN (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a decl_with_vis T.  */
-
-static inline bool
-mentions_vars_p_decl_with_vis (tree t)
-{
-  if (mentions_vars_p_decl_common (t))
-    return true;
-
-  /* Accessor macro has side-effects, use field-name here. */
-  CHECK_NO_VAR (DECL_ASSEMBLER_NAME_RAW (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a decl_non_common T.  */
-
-static inline bool
-mentions_vars_p_decl_non_common (tree t)
-{
-  if (mentions_vars_p_decl_with_vis (t))
-    return true;
-  CHECK_NO_VAR (DECL_RESULT_FLD (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a decl_non_common T.  */
-
-static bool
-mentions_vars_p_function (tree t)
-{
-  if (mentions_vars_p_decl_non_common (t))
-    return true;
-  CHECK_NO_VAR (DECL_ARGUMENTS (t));
-  CHECK_NO_VAR (DECL_VINDEX (t));
-  CHECK_VAR (DECL_FUNCTION_PERSONALITY (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a field_decl T.  */
-
-static bool
-mentions_vars_p_field_decl (tree t)
-{
-  if (mentions_vars_p_decl_common (t))
-    return true;
-  CHECK_VAR (DECL_FIELD_OFFSET (t));
-  CHECK_NO_VAR (DECL_BIT_FIELD_TYPE (t));
-  CHECK_NO_VAR (DECL_QUALIFIER (t));
-  CHECK_NO_VAR (DECL_FIELD_BIT_OFFSET (t));
-  CHECK_NO_VAR (DECL_FCONTEXT (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a type T.  */
-
-static bool
-mentions_vars_p_type (tree t)
-{
-  if (mentions_vars_p_common (t))
-    return true;
-  CHECK_NO_VAR (TYPE_CACHED_VALUES (t));
-  CHECK_VAR (TYPE_SIZE (t));
-  CHECK_VAR (TYPE_SIZE_UNIT (t));
-  CHECK_NO_VAR (TYPE_ATTRIBUTES (t));
-  CHECK_NO_VAR (TYPE_NAME (t));
-
-  CHECK_VAR (TYPE_MIN_VALUE_RAW (t));
-  CHECK_VAR (TYPE_MAX_VALUE_RAW (t));
-
-  /* Accessor is for derived node types only. */
-  CHECK_NO_VAR (TYPE_LANG_SLOT_1 (t));
-
-  CHECK_VAR (TYPE_CONTEXT (t));
-  CHECK_NO_VAR (TYPE_CANONICAL (t));
-  CHECK_NO_VAR (TYPE_MAIN_VARIANT (t));
-  CHECK_NO_VAR (TYPE_NEXT_VARIANT (t));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a BINFO T.  */
-
-static bool
-mentions_vars_p_binfo (tree t)
-{
-  unsigned HOST_WIDE_INT i, n;
-
-  if (mentions_vars_p_common (t))
-    return true;
-  CHECK_VAR (BINFO_VTABLE (t));
-  CHECK_NO_VAR (BINFO_OFFSET (t));
-  CHECK_NO_VAR (BINFO_VIRTUALS (t));
-  CHECK_NO_VAR (BINFO_VPTR_FIELD (t));
-  n = vec_safe_length (BINFO_BASE_ACCESSES (t));
-  for (i = 0; i < n; i++)
-    CHECK_NO_VAR (BINFO_BASE_ACCESS (t, i));
-  /* Do not walk BINFO_INHERITANCE_CHAIN, BINFO_SUBVTT_INDEX
-     and BINFO_VPTR_INDEX; these are used by C++ FE only.  */
-  n = BINFO_N_BASE_BINFOS (t);
-  for (i = 0; i < n; i++)
-    CHECK_NO_VAR (BINFO_BASE_BINFO (t, i));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of a CONSTRUCTOR T.  */
-
-static bool
-mentions_vars_p_constructor (tree t)
-{
-  unsigned HOST_WIDE_INT idx;
-  constructor_elt *ce;
-
-  if (mentions_vars_p_typed (t))
-    return true;
-
-  for (idx = 0; vec_safe_iterate (CONSTRUCTOR_ELTS (t), idx, &ce); idx++)
-    {
-      CHECK_NO_VAR (ce->index);
-      CHECK_VAR (ce->value);
-    }
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of an expression tree T.  */
-
-static bool
-mentions_vars_p_expr (tree t)
-{
-  int i;
-  if (mentions_vars_p_typed (t))
-    return true;
-  for (i = TREE_OPERAND_LENGTH (t) - 1; i >= 0; --i)
-    CHECK_VAR (TREE_OPERAND (t, i));
-  return false;
-}
-
-/* Check presence of pointers to decls in fields of an OMP_CLAUSE T.  */
-
-static bool
-mentions_vars_p_omp_clause (tree t)
-{
-  int i;
-  if (mentions_vars_p_common (t))
-    return true;
-  for (i = omp_clause_num_ops[OMP_CLAUSE_CODE (t)] - 1; i >= 0; --i)
-    CHECK_VAR (OMP_CLAUSE_OPERAND (t, i));
-  return false;
-}
-
-/* Check presence of pointers to decls that needs later fixup in T.  */
-
-static bool
-mentions_vars_p (tree t)
+materialize_cgraph (void)
 {
-  switch (TREE_CODE (t))
-    {
-    case IDENTIFIER_NODE:
-      break;
-
-    case TREE_LIST:
-      CHECK_VAR (TREE_VALUE (t));
-      CHECK_VAR (TREE_PURPOSE (t));
-      CHECK_NO_VAR (TREE_CHAIN (t));
-      break;
-
-    case FIELD_DECL:
-      return mentions_vars_p_field_decl (t);
-
-    case LABEL_DECL:
-    case CONST_DECL:
-    case PARM_DECL:
-    case RESULT_DECL:
-    case IMPORTED_DECL:
-    case NAMESPACE_DECL:
-    case NAMELIST_DECL:
-      return mentions_vars_p_decl_common (t);
-
-    case VAR_DECL:
-      return mentions_vars_p_decl_with_vis (t);
-
-    case TYPE_DECL:
-      return mentions_vars_p_decl_non_common (t);
-
-    case FUNCTION_DECL:
-      return mentions_vars_p_function (t);
-
-    case TREE_BINFO:
-      return mentions_vars_p_binfo (t);
-
-    case PLACEHOLDER_EXPR:
-      return mentions_vars_p_common (t);
-
-    case BLOCK:
-    case TRANSLATION_UNIT_DECL:
-    case OPTIMIZATION_NODE:
-    case TARGET_OPTION_NODE:
-      break;
-
-    case CONSTRUCTOR:
-      return mentions_vars_p_constructor (t);
-
-    case OMP_CLAUSE:
-      return mentions_vars_p_omp_clause (t);
-
-    default:
-      if (TYPE_P (t))
-	{
-	  if (mentions_vars_p_type (t))
-	    return true;
-	}
-      else if (EXPR_P (t))
-	{
-	  if (mentions_vars_p_expr (t))
-	    return true;
-	}
-      else if (CONSTANT_CLASS_P (t))
-	CHECK_NO_VAR (TREE_TYPE (t));
-      else
-	gcc_unreachable ();
-    }
-  return false;
-}
-
-
-/* Return the resolution for the decl with index INDEX from DATA_IN. */
-
-static enum ld_plugin_symbol_resolution
-get_resolution (struct data_in *data_in, unsigned index)
-{
-  if (data_in->globals_resolution.exists ())
-    {
-      ld_plugin_symbol_resolution_t ret;
-      /* We can have references to not emitted functions in
-	 DECL_FUNCTION_PERSONALITY at least.  So we can and have
-	 to indeed return LDPR_UNKNOWN in some cases.   */
-      if (data_in->globals_resolution.length () <= index)
-	return LDPR_UNKNOWN;
-      ret = data_in->globals_resolution[index];
-      return ret;
-    }
-  else
-    /* Delay resolution finding until decl merging.  */
-    return LDPR_UNKNOWN;
-}
-
-/* We need to record resolutions until symbol table is read.  */
-static void
-register_resolution (struct lto_file_decl_data *file_data, tree decl,
-		     enum ld_plugin_symbol_resolution resolution)
-{
-  bool existed;
-  if (resolution == LDPR_UNKNOWN)
-    return;
-  if (!file_data->resolution_map)
-    file_data->resolution_map
-      = new hash_map<tree, ld_plugin_symbol_resolution>;
-  ld_plugin_symbol_resolution_t &res
-     = file_data->resolution_map->get_or_insert (decl, &existed);
-  if (!existed
-      || resolution == LDPR_PREVAILING_DEF_IRONLY
-      || resolution == LDPR_PREVAILING_DEF
-      || resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
-    res = resolution;
-}
-
-/* Register DECL with the global symbol table and change its
-   name if necessary to avoid name clashes for static globals across
-   different files.  */
-
-static void
-lto_register_var_decl_in_symtab (struct data_in *data_in, tree decl,
-				 unsigned ix)
-{
-  tree context;
-
-  /* Variable has file scope, not local.  */
-  if (!TREE_PUBLIC (decl)
-      && !((context = decl_function_context (decl))
-	   && auto_var_in_fn_p (decl, context)))
-    rest_of_decl_compilation (decl, 1, 0);
-
-  /* If this variable has already been declared, queue the
-     declaration for merging.  */
-  if (TREE_PUBLIC (decl))
-    register_resolution (data_in->file_data,
-			 decl, get_resolution (data_in, ix));
-}
-
-
-/* Register DECL with the global symbol table and change its
-   name if necessary to avoid name clashes for static globals across
-   different files.  DATA_IN contains descriptors and tables for the
-   file being read.  */
-
-static void
-lto_register_function_decl_in_symtab (struct data_in *data_in, tree decl,
-				      unsigned ix)
-{
-  /* If this variable has already been declared, queue the
-     declaration for merging.  */
-  if (TREE_PUBLIC (decl) && !DECL_ABSTRACT_P (decl))
-    register_resolution (data_in->file_data,
-			 decl, get_resolution (data_in, ix));
-}
-
-/* Check if T is a decl and needs register its resolution info.  */
-
-static void
-lto_maybe_register_decl (struct data_in *data_in, tree t, unsigned ix)
-{
-  if (TREE_CODE (t) == VAR_DECL)
-    lto_register_var_decl_in_symtab (data_in, t, ix);
-  else if (TREE_CODE (t) == FUNCTION_DECL
-	   && !fndecl_built_in_p (t))
-    lto_register_function_decl_in_symtab (data_in, t, ix);
-}
-
-
-/* For the type T re-materialize it in the type variant list and
-   the pointer/reference-to chains.  */
-
-static void
-lto_fixup_prevailing_type (tree t)
-{
-  /* The following re-creates proper variant lists while fixing up
-     the variant leaders.  We do not stream TYPE_NEXT_VARIANT so the
-     variant list state before fixup is broken.  */
-
-  /* If we are not our own variant leader link us into our new leaders
-     variant list.  */
-  if (TYPE_MAIN_VARIANT (t) != t)
-    {
-      tree mv = TYPE_MAIN_VARIANT (t);
-      TYPE_NEXT_VARIANT (t) = TYPE_NEXT_VARIANT (mv);
-      TYPE_NEXT_VARIANT (mv) = t;
-    }
-
-  /* The following reconstructs the pointer chains
-     of the new pointed-to type if we are a main variant.  We do
-     not stream those so they are broken before fixup.  */
-  if (TREE_CODE (t) == POINTER_TYPE
-      && TYPE_MAIN_VARIANT (t) == t)
-    {
-      TYPE_NEXT_PTR_TO (t) = TYPE_POINTER_TO (TREE_TYPE (t));
-      TYPE_POINTER_TO (TREE_TYPE (t)) = t;
-    }
-  else if (TREE_CODE (t) == REFERENCE_TYPE
-	   && TYPE_MAIN_VARIANT (t) == t)
-    {
-      TYPE_NEXT_REF_TO (t) = TYPE_REFERENCE_TO (TREE_TYPE (t));
-      TYPE_REFERENCE_TO (TREE_TYPE (t)) = t;
-    }
-}
-
-
-/* We keep prevailing tree SCCs in a hashtable with manual collision
-   handling (in case all hashes compare the same) and keep the colliding
-   entries in the tree_scc->next chain.  */
-
-struct tree_scc
-{
-  tree_scc *next;
-  /* Hash of the whole SCC.  */
-  hashval_t hash;
-  /* Number of trees in the SCC.  */
-  unsigned len;
-  /* Number of possible entries into the SCC (tree nodes [0..entry_len-1]
-     which share the same individual tree hash).  */
-  unsigned entry_len;
-  /* The members of the SCC.
-     We only need to remember the first entry node candidate for prevailing
-     SCCs (but of course have access to all entries for SCCs we are
-     processing).
-     ???  For prevailing SCCs we really only need hash and the first
-     entry candidate, but that's too awkward to implement.  */
-  tree entries[1];
-};
-
-struct tree_scc_hasher : nofree_ptr_hash <tree_scc>
-{
-  static inline hashval_t hash (const tree_scc *);
-  static inline bool equal (const tree_scc *, const tree_scc *);
-};
-
-hashval_t
-tree_scc_hasher::hash (const tree_scc *scc)
-{
-  return scc->hash;
-}
-
-bool
-tree_scc_hasher::equal (const tree_scc *scc1, const tree_scc *scc2)
-{
-  if (scc1->hash != scc2->hash
-      || scc1->len != scc2->len
-      || scc1->entry_len != scc2->entry_len)
-    return false;
-  return true;
-}
-
-static hash_table<tree_scc_hasher> *tree_scc_hash;
-static struct obstack tree_scc_hash_obstack;
-
-static unsigned long num_merged_types;
-static unsigned long num_prevailing_types;
-static unsigned long num_type_scc_trees;
-static unsigned long total_scc_size;
-static unsigned long num_sccs_read;
-static unsigned long total_scc_size_merged;
-static unsigned long num_sccs_merged;
-static unsigned long num_scc_compares;
-static unsigned long num_scc_compare_collisions;
-
-
-/* Compare the two entries T1 and T2 of two SCCs that are possibly equal,
-   recursing through in-SCC tree edges.  Returns true if the SCCs entered
-   through T1 and T2 are equal and fills in *MAP with the pairs of
-   SCC entries we visited, starting with (*MAP)[0] = T1 and (*MAP)[1] = T2.  */
-
-static bool
-compare_tree_sccs_1 (tree t1, tree t2, tree **map)
-{
-  enum tree_code code;
-
-  /* Mark already visited nodes.  */
-  TREE_ASM_WRITTEN (t2) = 1;
-
-  /* Push the pair onto map.  */
-  (*map)[0] = t1;
-  (*map)[1] = t2;
-  *map = *map + 2;
-
-  /* Compare value-fields.  */
-#define compare_values(X) \
-  do { \
-    if (X(t1) != X(t2)) \
-      return false; \
-  } while (0)
-
-  compare_values (TREE_CODE);
-  code = TREE_CODE (t1);
-
-  if (!TYPE_P (t1))
-    {
-      compare_values (TREE_SIDE_EFFECTS);
-      compare_values (TREE_CONSTANT);
-      compare_values (TREE_READONLY);
-      compare_values (TREE_PUBLIC);
-    }
-  compare_values (TREE_ADDRESSABLE);
-  compare_values (TREE_THIS_VOLATILE);
-  if (DECL_P (t1))
-    compare_values (DECL_UNSIGNED);
-  else if (TYPE_P (t1))
-    compare_values (TYPE_UNSIGNED);
-  if (TYPE_P (t1))
-    compare_values (TYPE_ARTIFICIAL);
-  else
-    compare_values (TREE_NO_WARNING);
-  compare_values (TREE_NOTHROW);
-  compare_values (TREE_STATIC);
-  if (code != TREE_BINFO)
-    compare_values (TREE_PRIVATE);
-  compare_values (TREE_PROTECTED);
-  compare_values (TREE_DEPRECATED);
-  if (TYPE_P (t1))
-    {
-      if (AGGREGATE_TYPE_P (t1))
-	compare_values (TYPE_REVERSE_STORAGE_ORDER);
-      else
-	compare_values (TYPE_SATURATING);
-      compare_values (TYPE_ADDR_SPACE);
-    }
-  else if (code == SSA_NAME)
-    compare_values (SSA_NAME_IS_DEFAULT_DEF);
-
-  if (CODE_CONTAINS_STRUCT (code, TS_INT_CST))
-    {
-      if (wi::to_wide (t1) != wi::to_wide (t2))
-	return false;
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_REAL_CST))
-    {
-      /* ???  No suitable compare routine available.  */
-      REAL_VALUE_TYPE r1 = TREE_REAL_CST (t1);
-      REAL_VALUE_TYPE r2 = TREE_REAL_CST (t2);
-      if (r1.cl != r2.cl
-	  || r1.decimal != r2.decimal
-	  || r1.sign != r2.sign
-	  || r1.signalling != r2.signalling
-	  || r1.canonical != r2.canonical
-	  || r1.uexp != r2.uexp)
-	return false;
-      for (unsigned i = 0; i < SIGSZ; ++i)
-	if (r1.sig[i] != r2.sig[i])
-	  return false;
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_FIXED_CST))
-    if (!fixed_compare (EQ_EXPR,
-			TREE_FIXED_CST_PTR (t1), TREE_FIXED_CST_PTR (t2)))
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_VECTOR))
-    {
-      compare_values (VECTOR_CST_LOG2_NPATTERNS);
-      compare_values (VECTOR_CST_NELTS_PER_PATTERN);
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
-    {
-      compare_values (DECL_MODE);
-      compare_values (DECL_NONLOCAL);
-      compare_values (DECL_VIRTUAL_P);
-      compare_values (DECL_IGNORED_P);
-      compare_values (DECL_ABSTRACT_P);
-      compare_values (DECL_ARTIFICIAL);
-      compare_values (DECL_USER_ALIGN);
-      compare_values (DECL_PRESERVE_P);
-      compare_values (DECL_EXTERNAL);
-      compare_values (DECL_GIMPLE_REG_P);
-      compare_values (DECL_ALIGN);
-      if (code == LABEL_DECL)
-	{
-	  compare_values (EH_LANDING_PAD_NR);
-	  compare_values (LABEL_DECL_UID);
-	}
-      else if (code == FIELD_DECL)
-	{
-	  compare_values (DECL_PACKED);
-	  compare_values (DECL_NONADDRESSABLE_P);
-	  compare_values (DECL_PADDING_P);
-	  compare_values (DECL_OFFSET_ALIGN);
-	}
-      else if (code == VAR_DECL)
-	{
-	  compare_values (DECL_HAS_DEBUG_EXPR_P);
-	  compare_values (DECL_NONLOCAL_FRAME);
-	}
-      if (code == RESULT_DECL
-	  || code == PARM_DECL
-	  || code == VAR_DECL)
-	{
-	  compare_values (DECL_BY_REFERENCE);
-	  if (code == VAR_DECL
-	      || code == PARM_DECL)
-	    compare_values (DECL_HAS_VALUE_EXPR_P);
-	}
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WRTL))
-    compare_values (DECL_REGISTER);
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
-    {
-      compare_values (DECL_COMMON);
-      compare_values (DECL_DLLIMPORT_P);
-      compare_values (DECL_WEAK);
-      compare_values (DECL_SEEN_IN_BIND_EXPR_P);
-      compare_values (DECL_COMDAT);
-      compare_values (DECL_VISIBILITY);
-      compare_values (DECL_VISIBILITY_SPECIFIED);
-      if (code == VAR_DECL)
-	{
-	  compare_values (DECL_HARD_REGISTER);
-          /* DECL_IN_TEXT_SECTION is set during final asm output only.  */
-	  compare_values (DECL_IN_CONSTANT_POOL);
-	}
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
-    {
-      compare_values (DECL_BUILT_IN_CLASS);
-      compare_values (DECL_STATIC_CONSTRUCTOR);
-      compare_values (DECL_STATIC_DESTRUCTOR);
-      compare_values (DECL_UNINLINABLE);
-      compare_values (DECL_POSSIBLY_INLINED);
-      compare_values (DECL_IS_NOVOPS);
-      compare_values (DECL_IS_RETURNS_TWICE);
-      compare_values (DECL_IS_MALLOC);
-      compare_values (DECL_IS_OPERATOR_NEW);
-      compare_values (DECL_DECLARED_INLINE_P);
-      compare_values (DECL_STATIC_CHAIN);
-      compare_values (DECL_NO_INLINE_WARNING_P);
-      compare_values (DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT);
-      compare_values (DECL_NO_LIMIT_STACK);
-      compare_values (DECL_DISREGARD_INLINE_LIMITS);
-      compare_values (DECL_PURE_P);
-      compare_values (DECL_LOOPING_CONST_OR_PURE_P);
-      compare_values (DECL_FINAL_P);
-      compare_values (DECL_CXX_CONSTRUCTOR_P);
-      compare_values (DECL_CXX_DESTRUCTOR_P);
-      if (DECL_BUILT_IN_CLASS (t1) != NOT_BUILT_IN)
-	compare_values (DECL_FUNCTION_CODE);
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_COMMON))
-    {
-      compare_values (TYPE_MODE);
-      compare_values (TYPE_STRING_FLAG);
-      compare_values (TYPE_NEEDS_CONSTRUCTING);
-      if (RECORD_OR_UNION_TYPE_P (t1))
-	{
-	  compare_values (TYPE_TRANSPARENT_AGGR);
-	  compare_values (TYPE_FINAL_P);
-	}
-      else if (code == ARRAY_TYPE)
-	compare_values (TYPE_NONALIASED_COMPONENT);
-      if (AGGREGATE_TYPE_P (t1))
-	compare_values (TYPE_TYPELESS_STORAGE);
-      compare_values (TYPE_EMPTY_P);
-      compare_values (TYPE_PACKED);
-      compare_values (TYPE_RESTRICT);
-      compare_values (TYPE_USER_ALIGN);
-      compare_values (TYPE_READONLY);
-      compare_values (TYPE_PRECISION);
-      compare_values (TYPE_ALIGN);
-      /* Do not compare TYPE_ALIAS_SET.  Doing so introduce ordering issues
-         with calls to get_alias_set which may initialize it for streamed
- 	 in types.  */
-    }
-
-  /* We don't want to compare locations, so there is nothing do compare
-     for TS_EXP.  */
-
-  /* BLOCKs are function local and we don't merge anything there, so
-     simply refuse to merge.  */
-  if (CODE_CONTAINS_STRUCT (code, TS_BLOCK))
-    return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TRANSLATION_UNIT_DECL))
-    if (strcmp (TRANSLATION_UNIT_LANGUAGE (t1),
-		TRANSLATION_UNIT_LANGUAGE (t2)) != 0)
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TARGET_OPTION))
-    if (!cl_target_option_eq (TREE_TARGET_OPTION (t1), TREE_TARGET_OPTION (t2)))
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_OPTIMIZATION))
-    if (!cl_optimization_option_eq (TREE_OPTIMIZATION (t1),
-				    TREE_OPTIMIZATION (t2)))
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_BINFO))
-    if (vec_safe_length (BINFO_BASE_ACCESSES (t1))
-	!= vec_safe_length (BINFO_BASE_ACCESSES (t2)))
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_CONSTRUCTOR))
-    compare_values (CONSTRUCTOR_NELTS);
-
-  if (CODE_CONTAINS_STRUCT (code, TS_IDENTIFIER))
-    if (IDENTIFIER_LENGTH (t1) != IDENTIFIER_LENGTH (t2)
-	|| memcmp (IDENTIFIER_POINTER (t1), IDENTIFIER_POINTER (t2),
-		   IDENTIFIER_LENGTH (t1)) != 0)
-      return false;
-
-  if (CODE_CONTAINS_STRUCT (code, TS_STRING))
-    if (TREE_STRING_LENGTH (t1) != TREE_STRING_LENGTH (t2)
-	|| memcmp (TREE_STRING_POINTER (t1), TREE_STRING_POINTER (t2),
-		   TREE_STRING_LENGTH (t1)) != 0)
-      return false;
-
-  if (code == OMP_CLAUSE)
-    {
-      compare_values (OMP_CLAUSE_CODE);
-      switch (OMP_CLAUSE_CODE (t1))
-	{
-	case OMP_CLAUSE_DEFAULT:
-	  compare_values (OMP_CLAUSE_DEFAULT_KIND);
-	  break;
-	case OMP_CLAUSE_SCHEDULE:
-	  compare_values (OMP_CLAUSE_SCHEDULE_KIND);
-	  break;
-	case OMP_CLAUSE_DEPEND:
-	  compare_values (OMP_CLAUSE_DEPEND_KIND);
-	  break;
-	case OMP_CLAUSE_MAP:
-	  compare_values (OMP_CLAUSE_MAP_KIND);
-	  break;
-	case OMP_CLAUSE_PROC_BIND:
-	  compare_values (OMP_CLAUSE_PROC_BIND_KIND);
-	  break;
-	case OMP_CLAUSE_REDUCTION:
-	  compare_values (OMP_CLAUSE_REDUCTION_CODE);
-	  compare_values (OMP_CLAUSE_REDUCTION_GIMPLE_INIT);
-	  compare_values (OMP_CLAUSE_REDUCTION_GIMPLE_MERGE);
-	  break;
-	default:
-	  break;
-	}
-    }
-
-#undef compare_values
-
-
-  /* Compare pointer fields.  */
-
-  /* Recurse.  Search & Replaced from DFS_write_tree_body.
-     Folding the early checks into the compare_tree_edges recursion
-     macro makes debugging way quicker as you are able to break on
-     compare_tree_sccs_1 and simply finish until a call returns false
-     to spot the SCC members with the difference.  */
-#define compare_tree_edges(E1, E2) \
-  do { \
-    tree t1_ = (E1), t2_ = (E2); \
-    if (t1_ != t2_ \
-	&& (!t1_ || !t2_ \
-	    || !TREE_VISITED (t2_) \
-	    || (!TREE_ASM_WRITTEN (t2_) \
-		&& !compare_tree_sccs_1 (t1_, t2_, map)))) \
-      return false; \
-    /* Only non-NULL trees outside of the SCC may compare equal.  */ \
-    gcc_checking_assert (t1_ != t2_ || (!t2_ || !TREE_VISITED (t2_))); \
-  } while (0)
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TYPED))
-    {
-      if (code != IDENTIFIER_NODE)
-	compare_tree_edges (TREE_TYPE (t1), TREE_TYPE (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_VECTOR))
-    {
-      /* Note that the number of elements for EXPR has already been emitted
-	 in EXPR's header (see streamer_write_tree_header).  */
-      unsigned int count = vector_cst_encoded_nelts (t1);
-      for (unsigned int i = 0; i < count; ++i)
-	compare_tree_edges (VECTOR_CST_ENCODED_ELT (t1, i),
-			    VECTOR_CST_ENCODED_ELT (t2, i));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_COMPLEX))
-    {
-      compare_tree_edges (TREE_REALPART (t1), TREE_REALPART (t2));
-      compare_tree_edges (TREE_IMAGPART (t1), TREE_IMAGPART (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_MINIMAL))
-    {
-      compare_tree_edges (DECL_NAME (t1), DECL_NAME (t2));
-      /* ???  Global decls from different TUs have non-matching
-	 TRANSLATION_UNIT_DECLs.  Only consider a small set of
-	 decls equivalent, we should not end up merging others.  */
-      if ((code == TYPE_DECL
-	   || code == NAMESPACE_DECL
-	   || code == IMPORTED_DECL
-	   || code == CONST_DECL
-	   || (VAR_OR_FUNCTION_DECL_P (t1)
-	       && (TREE_PUBLIC (t1) || DECL_EXTERNAL (t1))))
-	  && DECL_FILE_SCOPE_P (t1) && DECL_FILE_SCOPE_P (t2))
-	;
-      else
-	compare_tree_edges (DECL_CONTEXT (t1), DECL_CONTEXT (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
-    {
-      compare_tree_edges (DECL_SIZE (t1), DECL_SIZE (t2));
-      compare_tree_edges (DECL_SIZE_UNIT (t1), DECL_SIZE_UNIT (t2));
-      compare_tree_edges (DECL_ATTRIBUTES (t1), DECL_ATTRIBUTES (t2));
-      compare_tree_edges (DECL_ABSTRACT_ORIGIN (t1), DECL_ABSTRACT_ORIGIN (t2));
-      if ((code == VAR_DECL
-	   || code == PARM_DECL)
-	  && DECL_HAS_VALUE_EXPR_P (t1))
-	compare_tree_edges (DECL_VALUE_EXPR (t1), DECL_VALUE_EXPR (t2));
-      if (code == VAR_DECL
-	  && DECL_HAS_DEBUG_EXPR_P (t1))
-	compare_tree_edges (DECL_DEBUG_EXPR (t1), DECL_DEBUG_EXPR (t2));
-      /* LTO specific edges.  */
-      if (code != FUNCTION_DECL
-	  && code != TRANSLATION_UNIT_DECL)
-	compare_tree_edges (DECL_INITIAL (t1), DECL_INITIAL (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_NON_COMMON))
-    {
-      if (code == FUNCTION_DECL)
-	{
-	  tree a1, a2;
-	  for (a1 = DECL_ARGUMENTS (t1), a2 = DECL_ARGUMENTS (t2);
-	       a1 || a2;
-	       a1 = TREE_CHAIN (a1), a2 = TREE_CHAIN (a2))
-	    compare_tree_edges (a1, a2);
-	  compare_tree_edges (DECL_RESULT (t1), DECL_RESULT (t2));
-	}
-      else if (code == TYPE_DECL)
-	compare_tree_edges (DECL_ORIGINAL_TYPE (t1), DECL_ORIGINAL_TYPE (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
-    {
-      /* Make sure we don't inadvertently set the assembler name.  */
-      if (DECL_ASSEMBLER_NAME_SET_P (t1))
-	compare_tree_edges (DECL_ASSEMBLER_NAME (t1),
-			    DECL_ASSEMBLER_NAME (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_FIELD_DECL))
-    {
-      compare_tree_edges (DECL_FIELD_OFFSET (t1), DECL_FIELD_OFFSET (t2));
-      compare_tree_edges (DECL_BIT_FIELD_TYPE (t1), DECL_BIT_FIELD_TYPE (t2));
-      compare_tree_edges (DECL_BIT_FIELD_REPRESENTATIVE (t1),
-			  DECL_BIT_FIELD_REPRESENTATIVE (t2));
-      compare_tree_edges (DECL_FIELD_BIT_OFFSET (t1),
-			  DECL_FIELD_BIT_OFFSET (t2));
-      compare_tree_edges (DECL_FCONTEXT (t1), DECL_FCONTEXT (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
-    {
-      compare_tree_edges (DECL_FUNCTION_PERSONALITY (t1),
-			  DECL_FUNCTION_PERSONALITY (t2));
-      compare_tree_edges (DECL_VINDEX (t1), DECL_VINDEX (t2));
-      compare_tree_edges (DECL_FUNCTION_SPECIFIC_TARGET (t1),
-			  DECL_FUNCTION_SPECIFIC_TARGET (t2));
-      compare_tree_edges (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (t1),
-			  DECL_FUNCTION_SPECIFIC_OPTIMIZATION (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_COMMON))
-    {
-      compare_tree_edges (TYPE_SIZE (t1), TYPE_SIZE (t2));
-      compare_tree_edges (TYPE_SIZE_UNIT (t1), TYPE_SIZE_UNIT (t2));
-      compare_tree_edges (TYPE_ATTRIBUTES (t1), TYPE_ATTRIBUTES (t2));
-      compare_tree_edges (TYPE_NAME (t1), TYPE_NAME (t2));
-      /* Do not compare TYPE_POINTER_TO or TYPE_REFERENCE_TO.  They will be
-	 reconstructed during fixup.  */
-      /* Do not compare TYPE_NEXT_VARIANT, we reconstruct the variant lists
-	 during fixup.  */
-      compare_tree_edges (TYPE_MAIN_VARIANT (t1), TYPE_MAIN_VARIANT (t2));
-      /* ???  Global types from different TUs have non-matching
-	 TRANSLATION_UNIT_DECLs.  Still merge them if they are otherwise
-	 equal.  */
-      if (TYPE_FILE_SCOPE_P (t1) && TYPE_FILE_SCOPE_P (t2))
-	;
-      else
-	compare_tree_edges (TYPE_CONTEXT (t1), TYPE_CONTEXT (t2));
-      /* TYPE_CANONICAL is re-computed during type merging, so do not
-	 compare it here.  */
-      compare_tree_edges (TYPE_STUB_DECL (t1), TYPE_STUB_DECL (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_TYPE_NON_COMMON))
-    {
-      if (code == ENUMERAL_TYPE)
-	compare_tree_edges (TYPE_VALUES (t1), TYPE_VALUES (t2));
-      else if (code == ARRAY_TYPE)
-	compare_tree_edges (TYPE_DOMAIN (t1), TYPE_DOMAIN (t2));
-      else if (RECORD_OR_UNION_TYPE_P (t1))
-	{
-	  tree f1, f2;
-	  for (f1 = TYPE_FIELDS (t1), f2 = TYPE_FIELDS (t2);
-	       f1 || f2;
-	       f1 = TREE_CHAIN (f1), f2 = TREE_CHAIN (f2))
-	    compare_tree_edges (f1, f2);
-	}
-      else if (code == FUNCTION_TYPE
-	       || code == METHOD_TYPE)
-	compare_tree_edges (TYPE_ARG_TYPES (t1), TYPE_ARG_TYPES (t2));
-
-      if (!POINTER_TYPE_P (t1))
-	compare_tree_edges (TYPE_MIN_VALUE_RAW (t1), TYPE_MIN_VALUE_RAW (t2));
-      compare_tree_edges (TYPE_MAX_VALUE_RAW (t1), TYPE_MAX_VALUE_RAW (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_LIST))
-    {
-      compare_tree_edges (TREE_PURPOSE (t1), TREE_PURPOSE (t2));
-      compare_tree_edges (TREE_VALUE (t1), TREE_VALUE (t2));
-      compare_tree_edges (TREE_CHAIN (t1), TREE_CHAIN (t2));
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_VEC))
-    for (int i = 0; i < TREE_VEC_LENGTH (t1); i++)
-      compare_tree_edges (TREE_VEC_ELT (t1, i), TREE_VEC_ELT (t2, i));
-
-  if (CODE_CONTAINS_STRUCT (code, TS_EXP))
-    {
-      for (int i = 0; i < TREE_OPERAND_LENGTH (t1); i++)
-	compare_tree_edges (TREE_OPERAND (t1, i),
-			    TREE_OPERAND (t2, i));
-
-      /* BLOCKs are function local and we don't merge anything there.  */
-      if (TREE_BLOCK (t1) || TREE_BLOCK (t2))
-	return false;
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_BINFO))
-    {
-      unsigned i;
-      tree t;
-      /* Lengths have already been compared above.  */
-      FOR_EACH_VEC_ELT (*BINFO_BASE_BINFOS (t1), i, t)
-	compare_tree_edges (t, BINFO_BASE_BINFO (t2, i));
-      FOR_EACH_VEC_SAFE_ELT (BINFO_BASE_ACCESSES (t1), i, t)
-	compare_tree_edges (t, BINFO_BASE_ACCESS (t2, i));
-      compare_tree_edges (BINFO_OFFSET (t1), BINFO_OFFSET (t2));
-      compare_tree_edges (BINFO_VTABLE (t1), BINFO_VTABLE (t2));
-      compare_tree_edges (BINFO_VPTR_FIELD (t1), BINFO_VPTR_FIELD (t2));
-      /* Do not walk BINFO_INHERITANCE_CHAIN, BINFO_SUBVTT_INDEX
-	 and BINFO_VPTR_INDEX; these are used by C++ FE only.  */
-    }
-
-  if (CODE_CONTAINS_STRUCT (code, TS_CONSTRUCTOR))
-    {
-      unsigned i;
-      tree index, value;
-      /* Lengths have already been compared above.  */
-      FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (t1), i, index, value)
-	{
-	  compare_tree_edges (index, CONSTRUCTOR_ELT (t2, i)->index);
-	  compare_tree_edges (value, CONSTRUCTOR_ELT (t2, i)->value);
-	}
-    }
-
-  if (code == OMP_CLAUSE)
-    {
-      int i;
-
-      for (i = 0; i < omp_clause_num_ops[OMP_CLAUSE_CODE (t1)]; i++)
-	compare_tree_edges (OMP_CLAUSE_OPERAND (t1, i),
-			    OMP_CLAUSE_OPERAND (t2, i));
-      compare_tree_edges (OMP_CLAUSE_CHAIN (t1), OMP_CLAUSE_CHAIN (t2));
-    }
-
-#undef compare_tree_edges
-
-  return true;
-}
-
-/* Compare the tree scc SCC to the prevailing candidate PSCC, filling
-   out MAP if they are equal.  */
-
-static bool
-compare_tree_sccs (tree_scc *pscc, tree_scc *scc,
-		   tree *map)
-{
-  /* Assume SCC entry hashes are sorted after their cardinality.  Which
-     means we can simply take the first n-tuple of equal hashes
-     (which is recorded as entry_len) and do n SCC entry candidate
-     comparisons.  */
-  for (unsigned i = 0; i < pscc->entry_len; ++i)
-    {
-      tree *mapp = map;
-      num_scc_compare_collisions++;
-      if (compare_tree_sccs_1 (pscc->entries[0], scc->entries[i], &mapp))
-	{
-	  /* Equal - no need to reset TREE_VISITED or TREE_ASM_WRITTEN
-	     on the scc as all trees will be freed.  */
-	  return true;
-	}
-      /* Reset TREE_ASM_WRITTEN on scc for the next compare or in case
-         the SCC prevails.  */
-      for (unsigned j = 0; j < scc->len; ++j)
-	TREE_ASM_WRITTEN (scc->entries[j]) = 0;
-    }
-
-  return false;
-}
-
-/* QSort sort function to sort a map of two pointers after the 2nd
-   pointer.  */
-
-static int
-cmp_tree (const void *p1_, const void *p2_)
-{
-  tree *p1 = (tree *)(const_cast<void *>(p1_));
-  tree *p2 = (tree *)(const_cast<void *>(p2_));
-  if (p1[1] == p2[1])
-    return 0;
-  return ((uintptr_t)p1[1] < (uintptr_t)p2[1]) ? -1 : 1;
-}
-
-/* Try to unify the SCC with nodes FROM to FROM + LEN in CACHE and
-   hash value SCC_HASH with an already recorded SCC.  Return true if
-   that was successful, otherwise return false.  */
-
-static bool
-unify_scc (struct data_in *data_in, unsigned from,
-	   unsigned len, unsigned scc_entry_len, hashval_t scc_hash)
-{
-  bool unified_p = false;
-  struct streamer_tree_cache_d *cache = data_in->reader_cache;
-  tree_scc *scc
-    = (tree_scc *) alloca (sizeof (tree_scc) + (len - 1) * sizeof (tree));
-  scc->next = NULL;
-  scc->hash = scc_hash;
-  scc->len = len;
-  scc->entry_len = scc_entry_len;
-  for (unsigned i = 0; i < len; ++i)
-    {
-      tree t = streamer_tree_cache_get_tree (cache, from + i);
-      scc->entries[i] = t;
-      /* Do not merge SCCs with local entities inside them.  Also do
-	 not merge TRANSLATION_UNIT_DECLs.  */
-      if (TREE_CODE (t) == TRANSLATION_UNIT_DECL
-	  || (VAR_OR_FUNCTION_DECL_P (t)
-	      && !(TREE_PUBLIC (t) || DECL_EXTERNAL (t)))
-	  || TREE_CODE (t) == LABEL_DECL)
-	{
-	  /* Avoid doing any work for these cases and do not worry to
-	     record the SCCs for further merging.  */
-	  return false;
-	}
-    }
-
-  /* Look for the list of candidate SCCs to compare against.  */
-  tree_scc **slot;
-  slot = tree_scc_hash->find_slot_with_hash (scc, scc_hash, INSERT);
-  if (*slot)
-    {
-      /* Try unifying against each candidate.  */
-      num_scc_compares++;
-
-      /* Set TREE_VISITED on the scc so we can easily identify tree nodes
-	 outside of the scc when following tree edges.  Make sure
-	 that TREE_ASM_WRITTEN is unset so we can use it as 2nd bit
-	 to track whether we visited the SCC member during the compare.
-	 We cannot use TREE_VISITED on the pscc members as the extended
-	 scc and pscc can overlap.  */
-      for (unsigned i = 0; i < scc->len; ++i)
-	{
-	  TREE_VISITED (scc->entries[i]) = 1;
-	  gcc_checking_assert (!TREE_ASM_WRITTEN (scc->entries[i]));
-	}
-
-      tree *map = XALLOCAVEC (tree, 2 * len);
-      for (tree_scc *pscc = *slot; pscc; pscc = pscc->next)
-	{
-	  if (!compare_tree_sccs (pscc, scc, map))
-	    continue;
-
-	  /* Found an equal SCC.  */
-	  unified_p = true;
-	  num_scc_compare_collisions--;
-	  num_sccs_merged++;
-	  total_scc_size_merged += len;
-
-	  if (flag_checking)
-	    for (unsigned i = 0; i < len; ++i)
-	      {
-		tree t = map[2*i+1];
-		enum tree_code code = TREE_CODE (t);
-		/* IDENTIFIER_NODEs should be singletons and are merged by the
-		   streamer.  The others should be singletons, too, and we
-		   should not merge them in any way.  */
-		gcc_assert (code != TRANSLATION_UNIT_DECL
-			    && code != IDENTIFIER_NODE);
-	      }
-
-	  /* Fixup the streamer cache with the prevailing nodes according
-	     to the tree node mapping computed by compare_tree_sccs.  */
-	  if (len == 1)
-	    {
-	      /* If we got a debug reference queued, see if the prevailing
-	         tree has a debug reference and if not, register the one
-		 for the tree we are about to throw away.  */
-	      if (dref_queue.length () == 1)
-		{
-		  dref_entry e = dref_queue.pop ();
-		  gcc_assert (e.decl
-			      == streamer_tree_cache_get_tree (cache, from));
-		  const char *sym;
-		  unsigned HOST_WIDE_INT off;
-		  if (!debug_hooks->die_ref_for_decl (pscc->entries[0], &sym,
-						      &off))
-		    debug_hooks->register_external_die (pscc->entries[0],
-							e.sym, e.off);
-		}
-	      lto_maybe_register_decl (data_in, pscc->entries[0], from);
-	      streamer_tree_cache_replace_tree (cache, pscc->entries[0], from);
-	    }
-	  else
-	    {
-	      tree *map2 = XALLOCAVEC (tree, 2 * len);
-	      for (unsigned i = 0; i < len; ++i)
-		{
-		  map2[i*2] = (tree)(uintptr_t)(from + i);
-		  map2[i*2+1] = scc->entries[i];
-		}
-	      qsort (map2, len, 2 * sizeof (tree), cmp_tree);
-	      qsort (map, len, 2 * sizeof (tree), cmp_tree);
-	      for (unsigned i = 0; i < len; ++i)
-		{
-		  lto_maybe_register_decl (data_in, map[2*i],
-					   (uintptr_t)map2[2*i]);
-		  streamer_tree_cache_replace_tree (cache, map[2*i],
-						    (uintptr_t)map2[2*i]);
-		}
-	    }
-
-	  /* Free the tree nodes from the read SCC.  */
-	  data_in->location_cache.revert_location_cache ();
-	  for (unsigned i = 0; i < len; ++i)
-	    {
-	      if (TYPE_P (scc->entries[i]))
-		num_merged_types++;
-	      free_node (scc->entries[i]);
-	    }
-
-	  /* Drop DIE references.
-	     ???  Do as in the size-one SCC case which involves sorting
-	     the queue.  */
-	  dref_queue.truncate (0);
-
-	  break;
-	}
-
-      /* Reset TREE_VISITED if we didn't unify the SCC with another.  */
-      if (!unified_p)
-	for (unsigned i = 0; i < scc->len; ++i)
-	  TREE_VISITED (scc->entries[i]) = 0;
-    }
-
-  /* If we didn't unify it to any candidate duplicate the relevant
-     pieces to permanent storage and link it into the chain.  */
-  if (!unified_p)
-    {
-      tree_scc *pscc
-	= XOBNEWVAR (&tree_scc_hash_obstack, tree_scc, sizeof (tree_scc));
-      memcpy (pscc, scc, sizeof (tree_scc));
-      pscc->next = (*slot);
-      *slot = pscc;
-    }
-  return unified_p;
-}
-
-
-/* Read all the symbols from buffer DATA, using descriptors in DECL_DATA.
-   RESOLUTIONS is the set of symbols picked by the linker (read from the
-   resolution file when the linker plugin is being used).  */
-
-static void
-lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
-		vec<ld_plugin_symbol_resolution_t> resolutions)
-{
-  const struct lto_decl_header *header = (const struct lto_decl_header *) data;
-  const int decl_offset = sizeof (struct lto_decl_header);
-  const int main_offset = decl_offset + header->decl_state_size;
-  const int string_offset = main_offset + header->main_size;
-  struct data_in *data_in;
-  unsigned int i;
-  const uint32_t *data_ptr, *data_end;
-  uint32_t num_decl_states;
-
-  lto_input_block ib_main ((const char *) data + main_offset,
-			   header->main_size, decl_data->mode_table);
-
-  data_in = lto_data_in_create (decl_data, (const char *) data + string_offset,
-				header->string_size, resolutions);
-
-  /* We do not uniquify the pre-loaded cache entries, those are middle-end
-     internal types that should not be merged.  */
-
-  /* Read the global declarations and types.  */
-  while (ib_main.p < ib_main.len)
-    {
-      tree t;
-      unsigned from = data_in->reader_cache->nodes.length ();
-      /* Read and uniquify SCCs as in the input stream.  */
-      enum LTO_tags tag = streamer_read_record_start (&ib_main);
-      if (tag == LTO_tree_scc)
-	{
-	  unsigned len_;
-	  unsigned scc_entry_len;
-	  hashval_t scc_hash = lto_input_scc (&ib_main, data_in, &len_,
-					      &scc_entry_len);
-	  unsigned len = data_in->reader_cache->nodes.length () - from;
-	  gcc_assert (len == len_);
-
-	  total_scc_size += len;
-	  num_sccs_read++;
-
-	  /* We have the special case of size-1 SCCs that are pre-merged
-	     by means of identifier and string sharing for example.
-	     ???  Maybe we should avoid streaming those as SCCs.  */
-	  tree first = streamer_tree_cache_get_tree (data_in->reader_cache,
-						     from);
-	  if (len == 1
-	      && (TREE_CODE (first) == IDENTIFIER_NODE
-		  || (TREE_CODE (first) == INTEGER_CST
-		      && !TREE_OVERFLOW (first))))
-	    continue;
-
-	  /* Try to unify the SCC with already existing ones.  */
-	  if (!flag_ltrans
-	      && unify_scc (data_in, from,
-			    len, scc_entry_len, scc_hash))
-	    continue;
-
-	  /* Tree merging failed, mark entries in location cache as
-	     permanent.  */
-	  data_in->location_cache.accept_location_cache ();
-
-	  bool seen_type = false;
-	  for (unsigned i = 0; i < len; ++i)
-	    {
-	      tree t = streamer_tree_cache_get_tree (data_in->reader_cache,
-						     from + i);
-	      /* Reconstruct the type variant and pointer-to/reference-to
-		 chains.  */
-	      if (TYPE_P (t))
-		{
-		  seen_type = true;
-		  num_prevailing_types++;
-		  lto_fixup_prevailing_type (t);
-
-		  /* Compute the canonical type of all types.
-		     Because SCC components are streamed in random (hash) order
-		     we may have encountered the type before while registering
-		     type canonical of a derived type in the same SCC.  */
-		  if (!TYPE_CANONICAL (t))
-		    gimple_register_canonical_type (t);
-		  if (TYPE_MAIN_VARIANT (t) == t && odr_type_p (t))
-		    register_odr_type (t);
-		}
-	      /* Link shared INTEGER_CSTs into TYPE_CACHED_VALUEs of its
-		 type which is also member of this SCC.  */
-	      if (TREE_CODE (t) == INTEGER_CST
-		  && !TREE_OVERFLOW (t))
-		cache_integer_cst (t);
-	      if (!flag_ltrans)
-		{
-		  lto_maybe_register_decl (data_in, t, from + i);
-		  /* Scan the tree for references to global functions or
-		     variables and record those for later fixup.  */
-		  if (mentions_vars_p (t))
-		    vec_safe_push (tree_with_vars, t);
-		}
-	    }
-
-	  /* Register DECLs with the debuginfo machinery.  */
-	  while (!dref_queue.is_empty ())
-	    {
-	      dref_entry e = dref_queue.pop ();
-	      debug_hooks->register_external_die (e.decl, e.sym, e.off);
-	    }
-
-	  if (seen_type)
-	    num_type_scc_trees += len;
-	}
-      else
-	{
-	  /* Pickle stray references.  */
-	  t = lto_input_tree_1 (&ib_main, data_in, tag, 0);
-	  gcc_assert (t && data_in->reader_cache->nodes.length () == from);
-	}
-    }
-  data_in->location_cache.apply_location_cache ();
-
-  /* Read in lto_in_decl_state objects.  */
-  data_ptr = (const uint32_t *) ((const char*) data + decl_offset); 
-  data_end =
-     (const uint32_t *) ((const char*) data_ptr + header->decl_state_size);
-  num_decl_states = *data_ptr++;
-  
-  gcc_assert (num_decl_states > 0);
-  decl_data->global_decl_state = lto_new_in_decl_state ();
-  data_ptr = lto_read_in_decl_state (data_in, data_ptr,
-				     decl_data->global_decl_state);
-
-  /* Read in per-function decl states and enter them in hash table.  */
-  decl_data->function_decl_states =
-    hash_table<decl_state_hasher>::create_ggc (37);
-
-  for (i = 1; i < num_decl_states; i++)
-    {
-      struct lto_in_decl_state *state = lto_new_in_decl_state ();
-
-      data_ptr = lto_read_in_decl_state (data_in, data_ptr, state);
-      lto_in_decl_state **slot
-	= decl_data->function_decl_states->find_slot (state, INSERT);
-      gcc_assert (*slot == NULL);
-      *slot = state;
-    }
-
-  if (data_ptr != data_end)
-    internal_error ("bytecode stream: garbage at the end of symbols section");
-
-  /* Set the current decl state to be the global state. */
-  decl_data->current_decl_state = decl_data->global_decl_state;
-
-  lto_data_in_delete (data_in);
-}
-
-/* Custom version of strtoll, which is not portable.  */
-
-static int64_t
-lto_parse_hex (const char *p)
-{
-  int64_t ret = 0;
-
-  for (; *p != '\0'; ++p)
-    {
-      char c = *p;
-      unsigned char part;
-      ret <<= 4;
-      if (c >= '0' && c <= '9')
-        part = c - '0';
-      else if (c >= 'a' && c <= 'f')
-        part = c - 'a' + 10;
-      else if (c >= 'A' && c <= 'F')
-        part = c - 'A' + 10;
-      else
-        internal_error ("could not parse hex number");
-      ret |= part;
-    }
-
-  return ret;
-}
-
-/* Read resolution for file named FILE_NAME. The resolution is read from
-   RESOLUTION. */
-
-static void
-lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file)
-{
-  /* We require that objects in the resolution file are in the same
-     order as the lto1 command line. */
-  unsigned int name_len;
-  char *obj_name;
-  unsigned int num_symbols;
-  unsigned int i;
-  struct lto_file_decl_data *file_data;
-  splay_tree_node nd = NULL; 
-
-  if (!resolution)
-    return;
-
-  name_len = strlen (file->filename);
-  obj_name = XNEWVEC (char, name_len + 1);
-  fscanf (resolution, " ");   /* Read white space. */
-
-  fread (obj_name, sizeof (char), name_len, resolution);
-  obj_name[name_len] = '\0';
-  if (filename_cmp (obj_name, file->filename) != 0)
-    internal_error ("unexpected file name %s in linker resolution file. "
-		    "Expected %s", obj_name, file->filename);
-  if (file->offset != 0)
-    {
-      int t;
-      char offset_p[17];
-      int64_t offset;
-      t = fscanf (resolution, "@0x%16s", offset_p);
-      if (t != 1)
-        internal_error ("could not parse file offset");
-      offset = lto_parse_hex (offset_p);
-      if (offset != file->offset)
-        internal_error ("unexpected offset");
-    }
-
-  free (obj_name);
-
-  fscanf (resolution, "%u", &num_symbols);
-
-  for (i = 0; i < num_symbols; i++)
-    {
-      int t;
-      unsigned index;
-      unsigned HOST_WIDE_INT id;
-      char r_str[27];
-      enum ld_plugin_symbol_resolution r = (enum ld_plugin_symbol_resolution) 0;
-      unsigned int j;
-      unsigned int lto_resolution_str_len =
-	sizeof (lto_resolution_str) / sizeof (char *);
-      res_pair rp;
-
-      t = fscanf (resolution, "%u " HOST_WIDE_INT_PRINT_HEX_PURE " %26s %*[^\n]\n", 
-		  &index, &id, r_str);
-      if (t != 3)
-        internal_error ("invalid line in the resolution file");
-
-      for (j = 0; j < lto_resolution_str_len; j++)
-	{
-	  if (strcmp (lto_resolution_str[j], r_str) == 0)
-	    {
-	      r = (enum ld_plugin_symbol_resolution) j;
-	      break;
-	    }
-	}
-      if (j == lto_resolution_str_len)
-	internal_error ("invalid resolution in the resolution file");
-
-      if (!(nd && lto_splay_tree_id_equal_p (nd->key, id)))
-	{
-	  nd = lto_splay_tree_lookup (file_ids, id);
-	  if (nd == NULL)
-	    internal_error ("resolution sub id %wx not in object file", id);
-	}
-
-      file_data = (struct lto_file_decl_data *)nd->value;
-      /* The indexes are very sparse. To save memory save them in a compact
-         format that is only unpacked later when the subfile is processed. */
-      rp.res = r;
-      rp.index = index;
-      file_data->respairs.safe_push (rp);
-      if (file_data->max_index < index)
-        file_data->max_index = index;
-    }
-}
-
-/* List of file_decl_datas */
-struct file_data_list
-  {
-    struct lto_file_decl_data *first, *last;
-  };
-
-/* Is the name for a id'ed LTO section? */
-
-static int 
-lto_section_with_id (const char *name, unsigned HOST_WIDE_INT *id)
-{
-  const char *s;
-
-  if (strncmp (name, section_name_prefix, strlen (section_name_prefix)))
-    return 0;
-  s = strrchr (name, '.');
-  if (!s)
-    return 0;
-  /* If the section is not suffixed with an ID return.  */
-  if ((size_t)(s - name) == strlen (section_name_prefix))
-    return 0;
-  return sscanf (s, "." HOST_WIDE_INT_PRINT_HEX_PURE, id) == 1;
-}
-
-/* Create file_data of each sub file id */
-
-static int 
-create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
-                            struct file_data_list *list)
-{
-  struct lto_section_slot s_slot, *new_slot;
-  unsigned HOST_WIDE_INT id;
-  splay_tree_node nd;
-  void **hash_slot;
-  char *new_name;
-  struct lto_file_decl_data *file_data;
-
-  if (!lto_section_with_id (ls->name, &id))
-    return 1;
-  
-  /* Find hash table of sub module id */
-  nd = lto_splay_tree_lookup (file_ids, id);
-  if (nd != NULL)
-    {
-      file_data = (struct lto_file_decl_data *)nd->value;
-    }
-  else
-    {
-      file_data = ggc_alloc<lto_file_decl_data> ();
-      memset(file_data, 0, sizeof (struct lto_file_decl_data));
-      file_data->id = id;
-      file_data->section_hash_table = lto_obj_create_section_hash_table ();
-      lto_splay_tree_insert (file_ids, id, file_data);
-
-      /* Maintain list in linker order */
-      if (!list->first)
-        list->first = file_data;
-      if (list->last)
-        list->last->next = file_data;
-      list->last = file_data;
-    }
-
-  /* Copy section into sub module hash table */
-  new_name = XDUPVEC (char, ls->name, strlen (ls->name) + 1);
-  s_slot.name = new_name;
-  hash_slot = htab_find_slot (file_data->section_hash_table, &s_slot, INSERT);
-  gcc_assert (*hash_slot == NULL);
-
-  new_slot = XDUP (struct lto_section_slot, ls);
-  new_slot->name = new_name;
-  *hash_slot = new_slot;
-  return 1;
-}
-
-/* Read declarations and other initializations for a FILE_DATA. */
-
-static void
-lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
-{
-  const char *data;
-  size_t len;
-  vec<ld_plugin_symbol_resolution_t>
-	resolutions = vNULL;
-  int i;
-  res_pair *rp;
-
-  /* Create vector for fast access of resolution. We do this lazily
-     to save memory. */ 
-  resolutions.safe_grow_cleared (file_data->max_index + 1);
-  for (i = 0; file_data->respairs.iterate (i, &rp); i++)
-    resolutions[rp->index] = rp->res;
-  file_data->respairs.release ();
-
-  file_data->renaming_hash_table = lto_create_renaming_table ();
-  file_data->file_name = file->filename;
-#ifdef ACCEL_COMPILER
-  lto_input_mode_table (file_data);
-#else
-  file_data->mode_table = lto_mode_identity_table;
-#endif
-  data = lto_get_section_data (file_data, LTO_section_decls, NULL, &len);
-  if (data == NULL)
-    {
-      internal_error ("cannot read LTO decls from %s", file_data->file_name);
-      return;
-    }
-  /* Frees resolutions */
-  lto_read_decls (file_data, data, resolutions);
-  lto_free_section_data (file_data, LTO_section_decls, NULL, data, len);
-}
-
-/* Finalize FILE_DATA in FILE and increase COUNT. */
-
-static int 
-lto_create_files_from_ids (lto_file *file, struct lto_file_decl_data *file_data,
-			   int *count)
-{
-  lto_file_finalize (file_data, file);
-  if (symtab->dump_file)
-    fprintf (symtab->dump_file,
-	     "Creating file %s with sub id " HOST_WIDE_INT_PRINT_HEX "\n",
-	     file_data->file_name, file_data->id);
-  (*count)++;
-  return 0;
-}
-
-/* Generate a TREE representation for all types and external decls
-   entities in FILE.  
-
-   Read all of the globals out of the file.  Then read the cgraph
-   and process the .o index into the cgraph nodes so that it can open
-   the .o file to load the functions and ipa information.   */
-
-static struct lto_file_decl_data *
-lto_file_read (lto_file *file, FILE *resolution_file, int *count)
-{
-  struct lto_file_decl_data *file_data = NULL;
-  splay_tree file_ids;
-  htab_t section_hash_table;
-  struct lto_section_slot *section;
-  struct file_data_list file_list;
-  struct lto_section_list section_list;
- 
-  memset (&section_list, 0, sizeof (struct lto_section_list)); 
-  section_hash_table = lto_obj_build_section_table (file, &section_list);
-
-  /* Find all sub modules in the object and put their sections into new hash
-     tables in a splay tree. */
-  file_ids = lto_splay_tree_new ();
-  memset (&file_list, 0, sizeof (struct file_data_list));
-  for (section = section_list.first; section != NULL; section = section->next)
-    create_subid_section_table (section, file_ids, &file_list);
-
-  /* Add resolutions to file ids */
-  lto_resolution_read (file_ids, resolution_file, file);
-
-  /* Finalize each lto file for each submodule in the merged object */
-  for (file_data = file_list.first; file_data != NULL; file_data = file_data->next)
-    lto_create_files_from_ids (file, file_data, count);
- 
-  splay_tree_delete (file_ids);
-  htab_delete (section_hash_table);
-
-  return file_list.first;
-}
-
-#if HAVE_MMAP_FILE && HAVE_SYSCONF && defined _SC_PAGE_SIZE
-#define LTO_MMAP_IO 1
-#endif
-
-#if LTO_MMAP_IO
-/* Page size of machine is used for mmap and munmap calls.  */
-static size_t page_mask;
-#endif
-
-/* Get the section data of length LEN from FILENAME starting at
-   OFFSET.  The data segment must be freed by the caller when the
-   caller is finished.  Returns NULL if all was not well.  */
-
-static char *
-lto_read_section_data (struct lto_file_decl_data *file_data,
-		       intptr_t offset, size_t len)
-{
-  char *result;
-  static int fd = -1;
-  static char *fd_name;
-#if LTO_MMAP_IO
-  intptr_t computed_len;
-  intptr_t computed_offset;
-  intptr_t diff;
-#endif
-
-  /* Keep a single-entry file-descriptor cache.  The last file we
-     touched will get closed at exit.
-     ???  Eventually we want to add a more sophisticated larger cache
-     or rather fix function body streaming to not stream them in
-     practically random order.  */
-  if (fd != -1
-      && filename_cmp (fd_name, file_data->file_name) != 0)
-    {
-      free (fd_name);
-      close (fd);
-      fd = -1;
-    }
-  if (fd == -1)
-    {
-      fd = open (file_data->file_name, O_RDONLY|O_BINARY);
-      if (fd == -1)
-        {
-	  fatal_error (input_location, "Cannot open %s", file_data->file_name);
-	  return NULL;
-        }
-      fd_name = xstrdup (file_data->file_name);
-    }
-
-#if LTO_MMAP_IO
-  if (!page_mask)
-    {
-      size_t page_size = sysconf (_SC_PAGE_SIZE);
-      page_mask = ~(page_size - 1);
-    }
-
-  computed_offset = offset & page_mask;
-  diff = offset - computed_offset;
-  computed_len = len + diff;
-
-  result = (char *) mmap (NULL, computed_len, PROT_READ, MAP_PRIVATE,
-			  fd, computed_offset);
-  if (result == MAP_FAILED)
-    {
-      fatal_error (input_location, "Cannot map %s", file_data->file_name);
-      return NULL;
-    }
-
-  return result + diff;
-#else
-  result = (char *) xmalloc (len);
-  if (lseek (fd, offset, SEEK_SET) != offset
-      || read (fd, result, len) != (ssize_t) len)
-    {
-      free (result);
-      fatal_error (input_location, "Cannot read %s", file_data->file_name);
-      result = NULL;
-    }
-#ifdef __MINGW32__
-  /* Native windows doesn't supports delayed unlink on opened file. So
-     we close file here again. This produces higher I/O load, but at least
-     it prevents to have dangling file handles preventing unlink.  */
-  free (fd_name);
-  fd_name = NULL;
-  close (fd);
-  fd = -1;
-#endif
-  return result;
-#endif
-}    
+  struct cgraph_node *node; 
+  timevar_id_t lto_timer;
 
+  if (!quiet_flag)
+    fprintf (stderr,
+	     flag_wpa ? "Materializing decls:" : "Reading function bodies:");
 
-/* Get the section data from FILE_DATA of SECTION_TYPE with NAME.
-   NAME will be NULL unless the section type is for a function
-   body.  */
 
-static const char *
-get_section_data (struct lto_file_decl_data *file_data,
-		      enum lto_section_type section_type,
-		      const char *name,
-		      size_t *len)
-{
-  htab_t section_hash_table = file_data->section_hash_table;
-  struct lto_section_slot *f_slot;
-  struct lto_section_slot s_slot;
-  const char *section_name = lto_get_section_name (section_type, name, file_data);
-  char *data = NULL;
-
-  *len = 0;
-  s_slot.name = section_name;
-  f_slot = (struct lto_section_slot *) htab_find (section_hash_table, &s_slot);
-  if (f_slot)
+  FOR_EACH_FUNCTION (node)
     {
-      data = lto_read_section_data (file_data, f_slot->start, f_slot->len);
-      *len = f_slot->len;
+      if (node->lto_file_data)
+	{
+	  lto_materialize_function (node);
+	  lto_stats.num_input_cgraph_nodes++;
+	}
     }
 
-  free (CONST_CAST (char *, section_name));
-  return data;
-}
-
 
-/* Free the section data from FILE_DATA of SECTION_TYPE with NAME that
-   starts at OFFSET and has LEN bytes.  */
+  /* Start the appropriate timer depending on the mode that we are
+     operating in.  */
+  lto_timer = (flag_wpa) ? TV_WHOPR_WPA
+	      : (flag_ltrans) ? TV_WHOPR_LTRANS
+	      : TV_LTO;
+  timevar_push (lto_timer);
 
-static void
-free_section_data (struct lto_file_decl_data *file_data ATTRIBUTE_UNUSED,
-		   enum lto_section_type section_type ATTRIBUTE_UNUSED,
-		   const char *name ATTRIBUTE_UNUSED,
-		   const char *offset, size_t len ATTRIBUTE_UNUSED)
-{
-#if LTO_MMAP_IO
-  intptr_t computed_len;
-  intptr_t computed_offset;
-  intptr_t diff;
-#endif
+  current_function_decl = NULL;
+  set_cfun (NULL);
 
-#if LTO_MMAP_IO
-  computed_offset = ((intptr_t) offset) & page_mask;
-  diff = (intptr_t) offset - computed_offset;
-  computed_len = len + diff;
+  if (!quiet_flag)
+    fprintf (stderr, "\n");
 
-  munmap ((caddr_t) computed_offset, computed_len);
-#else
-  free (CONST_CAST(char *, offset));
-#endif
+  timevar_pop (lto_timer);
 }
 
-static lto_file *current_lto_file;
-
 /* Actually stream out ENCODER into TEMP_FILENAME.  */
 
 static void
@@ -2528,581 +379,6 @@ lto_wpa_write_files (void)
   timevar_pop (TV_WHOPR_WPA_IO);
 }
 
-
-/* If TT is a variable or function decl replace it with its
-   prevailing variant.  */
-#define LTO_SET_PREVAIL(tt) \
-  do {\
-    if ((tt) && VAR_OR_FUNCTION_DECL_P (tt) \
-	&& (TREE_PUBLIC (tt) || DECL_EXTERNAL (tt))) \
-      { \
-        tt = lto_symtab_prevailing_decl (tt); \
-	fixed = true; \
-      } \
-  } while (0)
-
-/* Ensure that TT isn't a replacable var of function decl.  */
-#define LTO_NO_PREVAIL(tt) \
-  gcc_checking_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt))
-
-/* Given a tree T replace all fields referring to variables or functions
-   with their prevailing variant.  */
-static void
-lto_fixup_prevailing_decls (tree t)
-{
-  enum tree_code code = TREE_CODE (t);
-  bool fixed = false;
-
-  gcc_checking_assert (code != TREE_BINFO);
-  LTO_NO_PREVAIL (TREE_TYPE (t));
-  if (CODE_CONTAINS_STRUCT (code, TS_COMMON)
-      /* lto_symtab_prevail_decl use TREE_CHAIN to link to the prevailing decl.
-	 in the case T is a prevailed declaration we would ICE here. */
-      && !VAR_OR_FUNCTION_DECL_P (t))
-    LTO_NO_PREVAIL (TREE_CHAIN (t));
-  if (DECL_P (t))
-    {
-      LTO_NO_PREVAIL (DECL_NAME (t));
-      LTO_SET_PREVAIL (DECL_CONTEXT (t));
-      if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
-	{
-	  LTO_SET_PREVAIL (DECL_SIZE (t));
-	  LTO_SET_PREVAIL (DECL_SIZE_UNIT (t));
-	  LTO_SET_PREVAIL (DECL_INITIAL (t));
-	  LTO_NO_PREVAIL (DECL_ATTRIBUTES (t));
-	  LTO_SET_PREVAIL (DECL_ABSTRACT_ORIGIN (t));
-	}
-      if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
-	{
-	  LTO_NO_PREVAIL (DECL_ASSEMBLER_NAME_RAW (t));
-	}
-      if (CODE_CONTAINS_STRUCT (code, TS_DECL_NON_COMMON))
-	{
-	  LTO_NO_PREVAIL (DECL_RESULT_FLD (t));
-	}
-      if (CODE_CONTAINS_STRUCT (code, TS_FUNCTION_DECL))
-	{
-	  LTO_NO_PREVAIL (DECL_ARGUMENTS (t));
-	  LTO_SET_PREVAIL (DECL_FUNCTION_PERSONALITY (t));
-	  LTO_NO_PREVAIL (DECL_VINDEX (t));
-	}
-      if (CODE_CONTAINS_STRUCT (code, TS_FIELD_DECL))
-	{
-	  LTO_SET_PREVAIL (DECL_FIELD_OFFSET (t));
-	  LTO_NO_PREVAIL (DECL_BIT_FIELD_TYPE (t));
-	  LTO_NO_PREVAIL (DECL_QUALIFIER (t));
-	  LTO_NO_PREVAIL (DECL_FIELD_BIT_OFFSET (t));
-	  LTO_NO_PREVAIL (DECL_FCONTEXT (t));
-	}
-    }
-  else if (TYPE_P (t))
-    {
-      LTO_NO_PREVAIL (TYPE_CACHED_VALUES (t));
-      LTO_SET_PREVAIL (TYPE_SIZE (t));
-      LTO_SET_PREVAIL (TYPE_SIZE_UNIT (t));
-      LTO_NO_PREVAIL (TYPE_ATTRIBUTES (t));
-      LTO_NO_PREVAIL (TYPE_NAME (t));
-
-      LTO_SET_PREVAIL (TYPE_MIN_VALUE_RAW (t));
-      LTO_SET_PREVAIL (TYPE_MAX_VALUE_RAW (t));
-      LTO_NO_PREVAIL (TYPE_LANG_SLOT_1 (t));
-
-      LTO_SET_PREVAIL (TYPE_CONTEXT (t));
-
-      LTO_NO_PREVAIL (TYPE_CANONICAL (t));
-      LTO_NO_PREVAIL (TYPE_MAIN_VARIANT (t));
-      LTO_NO_PREVAIL (TYPE_NEXT_VARIANT (t));
-    }
-  else if (EXPR_P (t))
-    {
-      int i;
-      for (i = TREE_OPERAND_LENGTH (t) - 1; i >= 0; --i)
-	LTO_SET_PREVAIL (TREE_OPERAND (t, i));
-    }
-  else if (TREE_CODE (t) == CONSTRUCTOR)
-    {
-      unsigned i;
-      tree val;
-      FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (t), i, val)
-	LTO_SET_PREVAIL (val);
-    }
-  else
-    {
-      switch (code)
-	{
-	case TREE_LIST:
-	  LTO_SET_PREVAIL (TREE_VALUE (t));
-	  LTO_SET_PREVAIL (TREE_PURPOSE (t));
-	  LTO_NO_PREVAIL (TREE_PURPOSE (t));
-	  break;
-	default:
-	  gcc_unreachable ();
-	}
-    }
-  /* If we fixed nothing, then we missed something seen by
-     mentions_vars_p.  */
-  gcc_checking_assert (fixed);
-}
-#undef LTO_SET_PREVAIL
-#undef LTO_NO_PREVAIL
-
-/* Helper function of lto_fixup_decls. Walks the var and fn streams in STATE,
-   replaces var and function decls with the corresponding prevailing def.  */
-
-static void
-lto_fixup_state (struct lto_in_decl_state *state)
-{
-  unsigned i, si;
-
-  /* Although we only want to replace FUNCTION_DECLs and VAR_DECLs,
-     we still need to walk from all DECLs to find the reachable
-     FUNCTION_DECLs and VAR_DECLs.  */
-  for (si = 0; si < LTO_N_DECL_STREAMS; si++)
-    {
-      vec<tree, va_gc> *trees = state->streams[si];
-      for (i = 0; i < vec_safe_length (trees); i++)
-	{
-	  tree t = (*trees)[i];
-	  if (flag_checking && TYPE_P (t))
-	    verify_type (t);
-	  if (VAR_OR_FUNCTION_DECL_P (t)
-	      && (TREE_PUBLIC (t) || DECL_EXTERNAL (t)))
-	    (*trees)[i] = lto_symtab_prevailing_decl (t);
-	}
-    }
-}
-
-/* Fix the decls from all FILES. Replaces each decl with the corresponding
-   prevailing one.  */
-
-static void
-lto_fixup_decls (struct lto_file_decl_data **files)
-{
-  unsigned int i;
-  tree t;
-
-  if (tree_with_vars)
-    FOR_EACH_VEC_ELT ((*tree_with_vars), i, t)
-      lto_fixup_prevailing_decls (t);
-
-  for (i = 0; files[i]; i++)
-    {
-      struct lto_file_decl_data *file = files[i];
-      struct lto_in_decl_state *state = file->global_decl_state;
-      lto_fixup_state (state);
-
-      hash_table<decl_state_hasher>::iterator iter;
-      lto_in_decl_state *elt;
-      FOR_EACH_HASH_TABLE_ELEMENT (*file->function_decl_states, elt,
-				   lto_in_decl_state *, iter)
-	lto_fixup_state (elt);
-    }
-}
-
-static GTY((length ("lto_stats.num_input_files + 1"))) struct lto_file_decl_data **all_file_decl_data;
-
-/* Turn file datas for sub files into a single array, so that they look
-   like separate files for further passes. */
-
-static void
-lto_flatten_files (struct lto_file_decl_data **orig, int count, int last_file_ix)
-{
-  struct lto_file_decl_data *n, *next;
-  int i, k;
-
-  lto_stats.num_input_files = count;
-  all_file_decl_data
-    = ggc_cleared_vec_alloc<lto_file_decl_data_ptr> (count + 1);
-  /* Set the hooks so that all of the ipa passes can read in their data.  */
-  lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
-  for (i = 0, k = 0; i < last_file_ix; i++) 
-    {
-      for (n = orig[i]; n != NULL; n = next)
-	{
-	  all_file_decl_data[k++] = n;
-	  next = n->next;
-	  n->next = NULL;
-	}
-    }
-  all_file_decl_data[k] = NULL;
-  gcc_assert (k == count);
-}
-
-/* Input file data before flattening (i.e. splitting them to subfiles to support
-   incremental linking.  */
-static int real_file_count;
-static GTY((length ("real_file_count + 1"))) struct lto_file_decl_data **real_file_decl_data;
-
-static void print_lto_report_1 (void);
-
-/* Read all the symbols from the input files FNAMES.  NFILES is the
-   number of files requested in the command line.  Instantiate a
-   global call graph by aggregating all the sub-graphs found in each
-   file.  */
-
-static void
-read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
-{
-  unsigned int i, last_file_ix;
-  FILE *resolution;
-  int count = 0;
-  struct lto_file_decl_data **decl_data;
-  symtab_node *snode;
-
-  symtab->initialize ();
-
-  timevar_push (TV_IPA_LTO_DECL_IN);
-
-#ifdef ACCEL_COMPILER
-  section_name_prefix = OFFLOAD_SECTION_NAME_PREFIX;
-  lto_stream_offload_p = true;
-#endif
-
-  real_file_decl_data
-    = decl_data = ggc_cleared_vec_alloc<lto_file_decl_data_ptr> (nfiles + 1);
-  real_file_count = nfiles;
-
-  /* Read the resolution file.  */
-  resolution = NULL;
-  if (resolution_file_name)
-    {
-      int t;
-      unsigned num_objects;
-
-      resolution = fopen (resolution_file_name, "r");
-      if (resolution == NULL)
-	fatal_error (input_location,
-		     "could not open symbol resolution file: %m");
-
-      t = fscanf (resolution, "%u", &num_objects);
-      gcc_assert (t == 1);
-
-      /* True, since the plugin splits the archives.  */
-      gcc_assert (num_objects == nfiles);
-    }
-  symtab->state = LTO_STREAMING;
-
-  canonical_type_hash_cache = new hash_map<const_tree, hashval_t> (251);
-  gimple_canonical_types = htab_create (16381, gimple_canonical_type_hash,
-					gimple_canonical_type_eq, NULL);
-  gcc_obstack_init (&tree_scc_hash_obstack);
-  tree_scc_hash = new hash_table<tree_scc_hasher> (4096);
-
-  /* Register the common node types with the canonical type machinery so
-     we properly share alias-sets across languages and TUs.  Do not
-     expose the common nodes as type merge target - those that should be
-     are already exposed so by pre-loading the LTO streamer caches.
-     Do two passes - first clear TYPE_CANONICAL and then re-compute it.  */
-  for (i = 0; i < itk_none; ++i)
-    lto_register_canonical_types (integer_types[i], true);
-  for (i = 0; i < stk_type_kind_last; ++i)
-    lto_register_canonical_types (sizetype_tab[i], true);
-  for (i = 0; i < TI_MAX; ++i)
-    lto_register_canonical_types (global_trees[i], true);
-  for (i = 0; i < itk_none; ++i)
-    lto_register_canonical_types (integer_types[i], false);
-  for (i = 0; i < stk_type_kind_last; ++i)
-    lto_register_canonical_types (sizetype_tab[i], false);
-  for (i = 0; i < TI_MAX; ++i)
-    lto_register_canonical_types (global_trees[i], false);
-
-  if (!quiet_flag)
-    fprintf (stderr, "Reading object files:");
-
-  /* Read all of the object files specified on the command line.  */
-  for (i = 0, last_file_ix = 0; i < nfiles; ++i)
-    {
-      struct lto_file_decl_data *file_data = NULL;
-      if (!quiet_flag)
-	{
-	  fprintf (stderr, " %s", fnames[i]);
-	  fflush (stderr);
-	}
-
-      current_lto_file = lto_obj_file_open (fnames[i], false);
-      if (!current_lto_file)
-	break;
-
-      file_data = lto_file_read (current_lto_file, resolution, &count);
-      if (!file_data)
-	{
-	  lto_obj_file_close (current_lto_file);
-	  free (current_lto_file);
-	  current_lto_file = NULL;
-	  break;
-	}
-
-      decl_data[last_file_ix++] = file_data;
-
-      lto_obj_file_close (current_lto_file);
-      free (current_lto_file);
-      current_lto_file = NULL;
-    }
-
-  lto_flatten_files (decl_data, count, last_file_ix);
-  lto_stats.num_input_files = count;
-  ggc_free(decl_data);
-  real_file_decl_data = NULL;
-
-  if (resolution_file_name)
-    fclose (resolution);
-
-  /* Show the LTO report before launching LTRANS.  */
-  if (flag_lto_report || (flag_wpa && flag_lto_report_wpa))
-    print_lto_report_1 ();
-
-  /* Free gimple type merging datastructures.  */
-  delete tree_scc_hash;
-  tree_scc_hash = NULL;
-  obstack_free (&tree_scc_hash_obstack, NULL);
-  htab_delete (gimple_canonical_types);
-  gimple_canonical_types = NULL;
-  delete canonical_type_hash_cache;
-  canonical_type_hash_cache = NULL;
-
-  /* At this stage we know that majority of GGC memory is reachable.  
-     Growing the limits prevents unnecesary invocation of GGC.  */
-  ggc_grow ();
-  ggc_collect ();
-
-  /* Set the hooks so that all of the ipa passes can read in their data.  */
-  lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
-
-  timevar_pop (TV_IPA_LTO_DECL_IN);
-
-  if (!quiet_flag)
-    fprintf (stderr, "\nReading the callgraph\n");
-
-  timevar_push (TV_IPA_LTO_CGRAPH_IO);
-  /* Read the symtab.  */
-  input_symtab ();
-
-  input_offload_tables (!flag_ltrans);
-
-  /* Store resolutions into the symbol table.  */
-
-  FOR_EACH_SYMBOL (snode)
-    if (snode->externally_visible && snode->real_symbol_p ()
-	&& snode->lto_file_data && snode->lto_file_data->resolution_map
-	&& !(TREE_CODE (snode->decl) == FUNCTION_DECL
-	     && fndecl_built_in_p (snode->decl))
-	&& !(VAR_P (snode->decl) && DECL_HARD_REGISTER (snode->decl)))
-      {
-	ld_plugin_symbol_resolution_t *res;
-
-	res = snode->lto_file_data->resolution_map->get (snode->decl);
-	if (!res || *res == LDPR_UNKNOWN)
-	  {
-	    if (snode->output_to_lto_symbol_table_p ())
-	      fatal_error (input_location, "missing resolution data for %s",
-		           IDENTIFIER_POINTER
-			     (DECL_ASSEMBLER_NAME (snode->decl)));
-	  }
-	else
-          snode->resolution = *res;
-      }
-  for (i = 0; all_file_decl_data[i]; i++)
-    if (all_file_decl_data[i]->resolution_map)
-      {
-        delete all_file_decl_data[i]->resolution_map;
-        all_file_decl_data[i]->resolution_map = NULL;
-      }
-  
-  timevar_pop (TV_IPA_LTO_CGRAPH_IO);
-
-  if (!quiet_flag)
-    fprintf (stderr, "Merging declarations\n");
-
-  timevar_push (TV_IPA_LTO_DECL_MERGE);
-  /* Merge global decls.  In ltrans mode we read merged cgraph, we do not
-     need to care about resolving symbols again, we only need to replace
-     duplicated declarations read from the callgraph and from function
-     sections.  */
-  if (!flag_ltrans)
-    {
-      lto_symtab_merge_decls ();
-
-      /* If there were errors during symbol merging bail out, we have no
-	 good way to recover here.  */
-      if (seen_error ())
-	fatal_error (input_location,
-		     "errors during merging of translation units");
-
-      /* Fixup all decls.  */
-      lto_fixup_decls (all_file_decl_data);
-    }
-  if (tree_with_vars)
-    ggc_free (tree_with_vars);
-  tree_with_vars = NULL;
-  ggc_collect ();
-
-  timevar_pop (TV_IPA_LTO_DECL_MERGE);
-  /* Each pass will set the appropriate timer.  */
-
-  if (!quiet_flag)
-    fprintf (stderr, "Reading summaries\n");
-
-  /* Read the IPA summary data.  */
-  if (flag_ltrans)
-    ipa_read_optimization_summaries ();
-  else
-    ipa_read_summaries ();
-
-  for (i = 0; all_file_decl_data[i]; i++)
-    {
-      gcc_assert (all_file_decl_data[i]->symtab_node_encoder);
-      lto_symtab_encoder_delete (all_file_decl_data[i]->symtab_node_encoder);
-      all_file_decl_data[i]->symtab_node_encoder = NULL;
-      lto_free_function_in_decl_state (all_file_decl_data[i]->global_decl_state);
-      all_file_decl_data[i]->global_decl_state = NULL;
-      all_file_decl_data[i]->current_decl_state = NULL; 
-    }
-
-  if (!flag_ltrans)
-    {
-      /* Finally merge the cgraph according to the decl merging decisions.  */
-      timevar_push (TV_IPA_LTO_CGRAPH_MERGE);
-
-      gcc_assert (!dump_file);
-      dump_file = dump_begin (lto_link_dump_id, NULL);
-
-      if (dump_file)
-	{
-	  fprintf (dump_file, "Before merging:\n");
-	  symtab->dump (dump_file);
-	}
-      lto_symtab_merge_symbols ();
-      /* Removal of unreachable symbols is needed to make verify_symtab to pass;
-	 we are still having duplicated comdat groups containing local statics.
-	 We could also just remove them while merging.  */
-      symtab->remove_unreachable_nodes (dump_file);
-      ggc_collect ();
-
-      if (dump_file)
-        dump_end (lto_link_dump_id, dump_file);
-      dump_file = NULL;
-      timevar_pop (TV_IPA_LTO_CGRAPH_MERGE);
-    }
-  symtab->state = IPA_SSA;
-  /* All node removals happening here are useless, because
-     WPA should not stream them.  Still always perform remove_unreachable_nodes
-     because we may reshape clone tree, get rid of dead masters of inline
-     clones and remove symbol entries for read-only variables we keep around
-     only to be able to constant fold them.  */
-  if (flag_ltrans)
-    {
-      if (symtab->dump_file)
-	 symtab->dump (symtab->dump_file);
-      symtab->remove_unreachable_nodes (symtab->dump_file);
-    }
-
-  /* Indicate that the cgraph is built and ready.  */
-  symtab->function_flags_ready = true;
-
-  ggc_free (all_file_decl_data);
-  all_file_decl_data = NULL;
-}
-
-
-/* Materialize all the bodies for all the nodes in the callgraph.  */
-
-static void
-materialize_cgraph (void)
-{
-  struct cgraph_node *node; 
-  timevar_id_t lto_timer;
-
-  if (!quiet_flag)
-    fprintf (stderr,
-	     flag_wpa ? "Materializing decls:" : "Reading function bodies:");
-
-
-  FOR_EACH_FUNCTION (node)
-    {
-      if (node->lto_file_data)
-	{
-	  lto_materialize_function (node);
-	  lto_stats.num_input_cgraph_nodes++;
-	}
-    }
-
-
-  /* Start the appropriate timer depending on the mode that we are
-     operating in.  */
-  lto_timer = (flag_wpa) ? TV_WHOPR_WPA
-	      : (flag_ltrans) ? TV_WHOPR_LTRANS
-	      : TV_LTO;
-  timevar_push (lto_timer);
-
-  current_function_decl = NULL;
-  set_cfun (NULL);
-
-  if (!quiet_flag)
-    fprintf (stderr, "\n");
-
-  timevar_pop (lto_timer);
-}
-
-
-/* Show various memory usage statistics related to LTO.  */
-static void
-print_lto_report_1 (void)
-{
-  const char *pfx = (flag_lto) ? "LTO" : (flag_wpa) ? "WPA" : "LTRANS";
-  fprintf (stderr, "%s statistics\n", pfx);
-
-  fprintf (stderr, "[%s] read %lu SCCs of average size %f\n",
-	   pfx, num_sccs_read, total_scc_size / (double)num_sccs_read);
-  fprintf (stderr, "[%s] %lu tree bodies read in total\n", pfx, total_scc_size);
-  if (flag_wpa && tree_scc_hash)
-    {
-      fprintf (stderr, "[%s] tree SCC table: size %ld, %ld elements, "
-	       "collision ratio: %f\n", pfx,
-	       (long) tree_scc_hash->size (),
-	       (long) tree_scc_hash->elements (),
-	       tree_scc_hash->collisions ());
-      hash_table<tree_scc_hasher>::iterator hiter;
-      tree_scc *scc, *max_scc = NULL;
-      unsigned max_length = 0;
-      FOR_EACH_HASH_TABLE_ELEMENT (*tree_scc_hash, scc, x, hiter)
-	{
-	  unsigned length = 0;
-	  tree_scc *s = scc;
-	  for (; s; s = s->next)
-	    length++;
-	  if (length > max_length)
-	    {
-	      max_length = length;
-	      max_scc = scc;
-	    }
-	}
-      fprintf (stderr, "[%s] tree SCC max chain length %u (size %u)\n",
-	       pfx, max_length, max_scc->len);
-      fprintf (stderr, "[%s] Compared %lu SCCs, %lu collisions (%f)\n", pfx,
-	       num_scc_compares, num_scc_compare_collisions,
-	       num_scc_compare_collisions / (double) num_scc_compares);
-      fprintf (stderr, "[%s] Merged %lu SCCs\n", pfx, num_sccs_merged);
-      fprintf (stderr, "[%s] Merged %lu tree bodies\n", pfx,
-	       total_scc_size_merged);
-      fprintf (stderr, "[%s] Merged %lu types\n", pfx, num_merged_types);
-      fprintf (stderr, "[%s] %lu types prevailed (%lu associated trees)\n",
-	       pfx, num_prevailing_types, num_type_scc_trees);
-      fprintf (stderr, "[%s] GIMPLE canonical type table: size %ld, "
-	       "%ld elements, %ld searches, %ld collisions (ratio: %f)\n", pfx,
-	       (long) htab_size (gimple_canonical_types),
-	       (long) htab_elements (gimple_canonical_types),
-	       (long) gimple_canonical_types->searches,
-	       (long) gimple_canonical_types->collisions,
-	       htab_collisions (gimple_canonical_types));
-      fprintf (stderr, "[%s] GIMPLE canonical type pointer-map: "
-	       "%lu elements, %ld searches\n", pfx,
-	       num_canonical_type_hash_entries,
-	       num_canonical_type_hash_queries);
-    }
-
-  print_lto_report (pfx);
-}
-
 /* Perform whole program analysis (WPA) on the callgraph and write out the
    optimization plan.  */
 
@@ -3228,64 +504,6 @@ do_whole_program_analysis (void)
     dump_memory_report (true);
 }
 
-
-static GTY(()) tree lto_eh_personality_decl;
-
-/* Return the LTO personality function decl.  */
-
-tree
-lto_eh_personality (void)
-{
-  if (!lto_eh_personality_decl)
-    {
-      /* Use the first personality DECL for our personality if we don't
-	 support multiple ones.  This ensures that we don't artificially
-	 create the need for them in a single-language program.  */
-      if (first_personality_decl && !dwarf2out_do_cfi_asm ())
-	lto_eh_personality_decl = first_personality_decl;
-      else
-	lto_eh_personality_decl = lhd_gcc_personality ();
-    }
-
-  return lto_eh_personality_decl;
-}
-
-/* Set the process name based on the LTO mode. */
-
-static void 
-lto_process_name (void)
-{
-  if (flag_lto)
-    setproctitle (flag_incremental_link == INCREMENTAL_LINK_LTO
-		  ? "lto1-inclink" : "lto1-lto");
-  if (flag_wpa)
-    setproctitle ("lto1-wpa");
-  if (flag_ltrans)
-    setproctitle ("lto1-ltrans");
-}
-
-
-/* Initialize the LTO front end.  */
-
-static void
-lto_init (void)
-{
-  lto_process_name ();
-  lto_streamer_hooks_init ();
-  lto_reader_init ();
-  lto_set_in_hooks (NULL, get_section_data, free_section_data);
-  memset (&lto_stats, 0, sizeof (lto_stats));
-  bitmap_obstack_initialize (NULL);
-  gimple_register_cfg_hooks ();
-#ifndef ACCEL_COMPILER
-  unsigned char *table
-    = ggc_vec_alloc<unsigned char> (MAX_MACHINE_MODE);
-  for (int m = 0; m < MAX_MACHINE_MODE; m++)
-    table[m] = m;
-  lto_mode_identity_table = table;
-#endif
-}
-
 /* Create artificial pointers for "omp declare target link" vars.  */
 
 static void
@@ -3317,7 +535,6 @@ offload_handle_link_vars (void)
 #endif
 }
 
-
 /* Main entry point for the GIMPLE front end.  This front end has
    three main personalities:
 
@@ -3352,7 +569,7 @@ lto_main (void)
   timevar_start (TV_PHASE_SETUP);
 
   /* Initialize the LTO front end.  */
-  lto_init ();
+  lto_fe_init ();
 
   timevar_stop (TV_PHASE_SETUP);
   timevar_start (TV_PHASE_STREAM_IN);
@@ -3405,5 +622,3 @@ lto_main (void)
   timevar_start (TV_PHASE_PARSING);
   timevar_push (TV_PARSE_GLOBAL);
 }
-
-#include "gt-lto-lto.h"

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] Split part of functionality from lto.c to lto-common.c.
  2019-03-14 14:06 ` [PATCH 1/3] Split part of functionality from lto.c to lto-common.c marxin
@ 2019-04-26 12:47   ` Richard Biener
  0 siblings, 0 replies; 9+ messages in thread
From: Richard Biener @ 2019-04-26 12:47 UTC (permalink / raw)
  To: marxin; +Cc: GCC Patches, hrishikeshparag, Jan Hubicka

On Thu, Mar 14, 2019 at 3:01 PM marxin <mliska@suse.cz> wrote:
>
>
> gcc/lto/ChangeLog:

OK.

Thanks,
Richard.

> 2019-03-14  Martin Liska  <mliska@suse.cz>
>             Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>
>
>         * Make-lang.in: Add lto-common.o.
>         * config-lang.in: Likewise for gtfiles.
>         * lto-common.c: New file.
>         * lto-common.h: New file.
>         * lto-lang.c: Include lto-common.h.
>         * lto.c: Move most of the functionality
>         into lto-common.c file.
> ---
>  gcc/lto/Make-lang.in   |    2 +-
>  gcc/lto/config-lang.in |    2 +-
>  gcc/lto/lto-common.c   | 2837 ++++++++++++++++++++++++++++++++++++++++
>  gcc/lto/lto-common.h   |   33 +
>  gcc/lto/lto-lang.c     |    1 +
>  gcc/lto/lto.c          | 2837 +---------------------------------------
>  6 files changed, 2899 insertions(+), 2813 deletions(-)
>  create mode 100644 gcc/lto/lto-common.c
>  create mode 100644 gcc/lto/lto-common.h
>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] Add lto-dump tool.
  2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
@ 2019-04-26 13:14   ` Richard Biener
  2022-10-28 10:14   ` Thomas Schwinge
  1 sibling, 0 replies; 9+ messages in thread
From: Richard Biener @ 2019-04-26 13:14 UTC (permalink / raw)
  To: marxin; +Cc: GCC Patches, hrishikeshparag, Jan Hubicka

On Thu, Mar 14, 2019 at 3:00 PM marxin <mliska@suse.cz> wrote:
>

I think it's a good start.  Some minor nits:

+/* Dump the visibility of the symbol.  */
+
+const char *
+symtab_node::dump_visibility () const
+{
+  static const char * const visibility_types[]
+    = { "default", "protected", "hidden", "internal" };
+  return visibility_types[DECL_VISIBILITY (decl)];
+}
+
+/* Dump the type_name of the symbol.  */
+const char *
+symtab_node::dump_type_name () const
+{
+  return symtab_type_names[type];
+}

Both method names are not very good.  I guess the first
should be get_visibilitiy_string and the second
get_symtab_type_string?  Because they do not actually
dump.

For the function statistics I wonder if we really need the
untransformed body or if we can resort to inline information
that must be also in the LTO stream.

Otherwise looks OK to me.

Thanks,
Richard.

> gcc/ChangeLog:
>
> 2019-03-14  Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>
>             Martin Liska  <mliska@suse.cz>
>
>         * Makefile.in: Add lto-dump.texi.
>         * cgraph.h: Add new functions dump_visibility and
>         dump_type_name.
>         * doc/gcc.texi: Include lto-dump section.
>         * doc/lto-dump.texi: New file.
>         * dumpfile.c (dump_switch_p_1): Use parse_dump_option.
>         (parse_dump_option): Factor out this function.
>         * dumpfile.h (enum dump_flag): Add new value TDF_ERROR.
>         (parse_dump_option): Export the function.
>         * symtab.c (symtab_node::dump_visibility): New function.
>         (symtab_node::dump_type_name): Likewise.
>
> gcc/lto/ChangeLog:
>
> 2019-03-14  Hrishikesh Kulkarni  <hrishikeshparag@gmail.com>
>             Martin Liska  <mliska@suse.cz>
>
>         * Make-lang.in: Add lto_dump-related definition.
>         * config-lang.in: Likewise.
>         * lang.opt: Add new language LTODump and options related
>         to LTO dump tool.
>         * lto-common.c (lto_read_decls): Support type statistics dump.
>         (lto_file_read): Likewise for object files.
>         * lto-dump.c: New file.
>         * lto-lang.c (lto_option_lang_mask): Move from ..
>         * lto.c (lto_option_lang_mask): .. here.
>         * lto.h (lto_option_lang_mask): New declaration.
> ---
>  gcc/Makefile.in        |   2 +-
>  gcc/cgraph.h           |   6 +
>  gcc/doc/gcc.texi       |   5 +
>  gcc/doc/lto-dump.texi  | 131 ++++++++++++++++
>  gcc/dumpfile.c         |  85 ++++++----
>  gcc/dumpfile.h         |   5 +
>  gcc/lto/Make-lang.in   |  20 ++-
>  gcc/lto/config-lang.in |   4 +-
>  gcc/lto/lang.opt       |  62 ++++++++
>  gcc/lto/lto-common.c   |  40 +++++
>  gcc/lto/lto-dump.c     | 344 +++++++++++++++++++++++++++++++++++++++++
>  gcc/lto/lto-lang.c     |   6 -
>  gcc/lto/lto.c          |   6 +
>  gcc/lto/lto.h          |   2 +
>  gcc/symtab.c           |  17 ++
>  15 files changed, 692 insertions(+), 43 deletions(-)
>  create mode 100644 gcc/doc/lto-dump.texi
>  create mode 100644 gcc/lto/lto-dump.c
>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 3/3] Fix GNU coding style in lto-common.c.
  2019-03-14 14:00 ` [PATCH 3/3] Fix GNU coding style in lto-common.c marxin
@ 2019-04-29 19:43   ` Jeff Law
  0 siblings, 0 replies; 9+ messages in thread
From: Jeff Law @ 2019-04-29 19:43 UTC (permalink / raw)
  To: marxin, gcc-patches; +Cc: hrishikeshparag, hubicka

On 3/14/19 7:02 AM, marxin wrote:
> 
> gcc/lto/ChangeLog:
> 
> 2019-03-14  Martin Liska  <mliska@suse.cz>
> 
> 	* lto-common.c: Update coding style.
> 	* lto.c (materialize_cgraph): Likewise.
> ---
>  gcc/lto/lto-common.c | 214 ++++++++++++++++++++++---------------------
>  gcc/lto/lto.c        |  30 +++---
>  2 files changed, 128 insertions(+), 116 deletions(-)
> 
OK once the others have gone in.

jeff

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] Add lto-dump tool.
  2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
  2019-04-26 13:14   ` Richard Biener
@ 2022-10-28 10:14   ` Thomas Schwinge
  2022-10-29  3:22     ` Jeff Law
  1 sibling, 1 reply; 9+ messages in thread
From: Thomas Schwinge @ 2022-10-28 10:14 UTC (permalink / raw)
  To: Martin Liška, gcc-patches; +Cc: hrishikeshparag, hubicka

[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]

Hi!

This minor clean-up had fallen out of me working on something else in
GCC's options machinery, several months ago:

On 2019-03-12T18:14:04+0100, marxin <mliska@suse.cz> wrote:
> gcc/lto/ChangeLog:

>       * lang.opt: Add new language LTODump and options related
>       to LTO dump tool.

As this new "Language" 'LTODump' does not share any options with 'LTO'
proper, it makes sense, in my opinion, to also make that obvious in
'gcc/lto/lang.opt', which your Subversion r270897 (Git
commit 66d62d9f2e6b059be6a018397fba555147133a9a) "Add lto-dump tool"
almost ;-) did:

> --- a/gcc/lto/lang.opt
> +++ b/gcc/lto/lang.opt
> @@ -24,6 +24,9 @@
>  Language
>  LTO
>
> +Language
> +LTODump
> +
>  Enum
>  Name(lto_linker_output) Type(enum lto_linker_output) UnknownError(unknown linker output %qs)
>
> @@ -66,6 +69,65 @@ fwpa=
>  LTO Driver RejectNegative Joined Var(flag_wpa)
>  Whole program analysis (WPA) mode with number of parallel jobs specified.
>
> +
> +[LTODump option records]
> +
> +
>  fresolution=
>  LTO Joined
>  The resolution file.

OK to push the attached
"Better separate 'LTO' vs. 'LTODump' in 'gcc/lto/lang.opt'"?


Grüße
 Thomas


-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Better-separate-LTO-vs.-LTODump-in-gcc-lto-lang.opt.patch --]
[-- Type: text/x-diff, Size: 1907 bytes --]

From 7fe1d5b8d39d863285e14fbb186599dcf6bba986 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 1 Apr 2022 19:52:54 +0200
Subject: [PATCH] Better separate 'LTO' vs. 'LTODump' in 'gcc/lto/lang.opt'

Minor clean-up after Subversion r270897 (Git
commit 66d62d9f2e6b059be6a018397fba555147133a9a) "Add lto-dump tool".

No change in generated files.

	gcc/lto/
	* lang.opt: Better separate 'LTO' vs. 'LTODump'.
---
 gcc/lto/lang.opt | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gcc/lto/lang.opt b/gcc/lto/lang.opt
index 550a50fc188..1ad2967d9cf 100644
--- a/gcc/lto/lang.opt
+++ b/gcc/lto/lang.opt
@@ -24,9 +24,6 @@
 Language
 LTO
 
-Language
-LTODump
-
 Enum
 Name(lto_linker_output) Type(enum lto_linker_output) UnknownError(unknown linker output %qs)
 
@@ -52,7 +49,6 @@ flinker-output=
 LTO Driver Joined RejectNegative Enum(lto_linker_output) Var(flag_lto_linker_output) Init(LTO_LINKER_OUTPUT_UNKNOWN)
 Set linker output type (used internally during LTO optimization).
 
-
 fltrans
 LTO Var(flag_ltrans)
 Run the link-time optimizer in local transformation (LTRANS) mode.
@@ -61,6 +57,10 @@ fltrans-output-list=
 LTO Joined Var(ltrans_output_list)
 Specify a file to which a list of files output by LTRANS is written.
 
+fresolution=
+LTO Joined
+The resolution file.
+
 fwpa
 LTO Driver
 Run the link-time optimizer in whole program analysis (WPA) mode.
@@ -70,6 +70,9 @@ LTO Driver RejectNegative Joined Var(flag_wpa)
 Whole program analysis (WPA) mode with number of parallel jobs specified.
 
 
+Language
+LTODump
+
 list
 LTODump Var(flag_lto_dump_list)
 Call the dump function for variables and function in IL.
@@ -131,8 +134,4 @@ callgraph
 LTODump Var(flag_dump_callgraph)
 Dump the symtab callgraph.
 
-fresolution=
-LTO Joined
-The resolution file.
-
 ; This comment is to ensure we retain the blank line above.
-- 
2.35.1


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] Add lto-dump tool.
  2022-10-28 10:14   ` Thomas Schwinge
@ 2022-10-29  3:22     ` Jeff Law
  0 siblings, 0 replies; 9+ messages in thread
From: Jeff Law @ 2022-10-29  3:22 UTC (permalink / raw)
  To: Thomas Schwinge, Martin Liška, gcc-patches; +Cc: hubicka


On 10/28/22 04:14, Thomas Schwinge wrote:
> Hi!
>
> This minor clean-up had fallen out of me working on something else in
> GCC's options machinery, several months ago:
>
> On 2019-03-12T18:14:04+0100, marxin <mliska@suse.cz> wrote:
>> gcc/lto/ChangeLog:
>>        * lang.opt: Add new language LTODump and options related
>>        to LTO dump tool.
> As this new "Language" 'LTODump' does not share any options with 'LTO'
> proper, it makes sense, in my opinion, to also make that obvious in
> 'gcc/lto/lang.opt', which your Subversion r270897 (Git
> commit 66d62d9f2e6b059be6a018397fba555147133a9a) "Add lto-dump tool"
> almost ;-) did:
>
>> --- a/gcc/lto/lang.opt
>> +++ b/gcc/lto/lang.opt
>> @@ -24,6 +24,9 @@
>>   Language
>>   LTO
>>
>> +Language
>> +LTODump
>> +
>>   Enum
>>   Name(lto_linker_output) Type(enum lto_linker_output) UnknownError(unknown linker output %qs)
>>
>> @@ -66,6 +69,65 @@ fwpa=
>>   LTO Driver RejectNegative Joined Var(flag_wpa)
>>   Whole program analysis (WPA) mode with number of parallel jobs specified.
>>
>> +
>> +[LTODump option records]
>> +
>> +
>>   fresolution=
>>   LTO Joined
>>   The resolution file.
> OK to push the attached
> "Better separate 'LTO' vs. 'LTODump' in 'gcc/lto/lang.opt'"?

OK.

jeff



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-29  3:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-14 14:00 [PATCH 0/3][stage1] [PATCH v2] LTO dump tool marxin
2019-03-14 14:00 ` [PATCH 2/3] Add lto-dump tool marxin
2019-04-26 13:14   ` Richard Biener
2022-10-28 10:14   ` Thomas Schwinge
2022-10-29  3:22     ` Jeff Law
2019-03-14 14:00 ` [PATCH 3/3] Fix GNU coding style in lto-common.c marxin
2019-04-29 19:43   ` Jeff Law
2019-03-14 14:06 ` [PATCH 1/3] Split part of functionality from lto.c to lto-common.c marxin
2019-04-26 12:47   ` Richard Biener

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).