lto-wrapper.c (DUMPBASE_SUFFIX): Define.

2010-05-07  Richard Guenther  <rguenther@suse.de>

	* lto-wrapper.c (DUMPBASE_SUFFIX): Define.
	(run_gcc): Handle LTRANS phase invocation.
	* collect2.c (maybe_run_lto_and_relink): Do not set
	WPA_SAVE_LTRANS.

	lto/
	* lto.c (DUMPBASE_SUFFIX): Remove.
	(lto_execute_ltrans): Move functionality to lto-wrapper.c.
	Rename to ...
	(lto_write_ltrans_list): ... only output the list of ltrans files.
	(lto_maybe_unlink): Remove.
	(do_whole_program_analysis): Do not execute LTRANS phase
	from here.

From-SVN: r159157

5 files changed, 189 insertions, 194 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7013c3..d334f63 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-07  Richard Guenther  <rguenther@suse.de>
+
+	* lto-wrapper.c (DUMPBASE_SUFFIX): Define.
+	(run_gcc): Handle LTRANS phase invocation.
+	* collect2.c (maybe_run_lto_and_relink): Do not set
+	WPA_SAVE_LTRANS.
+
 2010-05-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* tree.h (TREE_ADDRESSABLE): Adjust comment to say that
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 6b2bb50..99d9be4 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1007,10 +1007,6 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
 
       *lto_c_ptr = NULL;
 
-      /* Save intermediate WPA files in lto1 if debug.  */
-      if (debug)
-	putenv (xstrdup ("WPA_SAVE_LTRANS=1"));
-
       /* Run the LTO back end.  */
       pex = collect_execute (prog, lto_c_argv, NULL, NULL, PEX_SEARCH);
       {
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index ec0a96e..c9a37d9 100644
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "intl.h"
 #include "libiberty.h"
+#include "obstack.h"
 
 int debug;				/* true if -debug */
 
@@ -246,6 +247,8 @@ fork_execute (char **argv)
   free (at_args);
 }
 
+/* Template of LTRANS dumpbase suffix.  */
+#define DUMPBASE_SUFFIX ".ltrans18446744073709551615"
 
 /* Execute gcc. ARGC is the number of arguments. ARGV contains the arguments. */
 
@@ -350,6 +353,7 @@ run_gcc (unsigned argc, char *argv[])
   *argv_ptr = NULL;
 
   fork_execute (CONST_CAST (char **, new_argv));
+
   free (new_argv);
   new_argv = NULL;
 
@@ -362,16 +366,164 @@ run_gcc (unsigned argc, char *argv[])
   else if (lto_mode == LTO_MODE_WHOPR)
     {
       FILE *stream = fopen (ltrans_output_file, "r");
-      int c;
+      const char *collect_gcc_options, *collect_gcc;
+      struct obstack env_obstack;
+      bool seen_dumpbase = false;
+      char *dumpbase_suffix = NULL;
+      unsigned j;
 
       if (!stream)
 	fatal_perror ("fopen: %s", ltrans_output_file);
 
-      while ((c = getc (stream)) != EOF)
-	putc (c, stdout);
+      /* Get the driver and options.  */
+      collect_gcc = getenv ("COLLECT_GCC");
+      if (!collect_gcc)
+	fatal ("environment variable COLLECT_GCC must be set");
+
+      /* Set the CFLAGS environment variable.  */
+      collect_gcc_options = getenv ("COLLECT_GCC_OPTIONS");
+      if (!collect_gcc_options)
+	fatal ("environment variable COLLECT_GCC_OPTIONS must be set");
+
+      /* Count arguments.  */
+      i = 0;
+      for (j = 0; collect_gcc_options[j] != '\0'; ++j)
+	if (collect_gcc_options[j] == '\'')
+	  ++i;
+
+      if (i % 2 != 0)
+	fatal ("malformed COLLECT_GCC_OPTIONS");
+
+      /* Initalize the arguments for the LTRANS driver.  */
+      new_argv = (const char **) xmalloc ((8 + i / 2) * sizeof (char *));
+      argv_ptr = new_argv;
+      *argv_ptr++ = collect_gcc;
+      *argv_ptr++ = "-xlto";
+      *argv_ptr++ = "-c";
+      for (j = 0; collect_gcc_options[j] != '\0'; ++j)
+	if (collect_gcc_options[j] == '\'')
+	  {
+	    char *option;
+
+	    ++j;
+	    i = j;
+	    while (collect_gcc_options[j] != '\'')
+	      ++j;
+	    obstack_init (&env_obstack);
+	    obstack_grow (&env_obstack, &collect_gcc_options[i], j - i);
+	    if (seen_dumpbase)
+	      obstack_grow (&env_obstack, DUMPBASE_SUFFIX,
+			    sizeof (DUMPBASE_SUFFIX));
+	    else
+	      obstack_1grow (&env_obstack, 0);
+	    option = XOBFINISH (&env_obstack, char *);
+	    if (seen_dumpbase)
+	      {
+		dumpbase_suffix = option + 7 + j - i;
+		seen_dumpbase = false;
+	      }
+
+	    /* LTRANS does not need -fwhopr.  */
+	    if (strncmp (option, "-fwhopr", 7) != 0)
+	      {
+		if (strncmp (option, "-dumpbase", 9) == 0)
+		  seen_dumpbase = true;
+		*argv_ptr++ = option;
+	      }
+	  }
+      *argv_ptr++ = "-fltrans";
+
+      for (;;)
+	{
+	  const unsigned piece = 32;
+	  char *output_name;
+	  char *buf, *input_name = (char *)xmalloc (piece);
+	  size_t len;
+
+	  buf = input_name;
+cont:
+	  if (!fgets (buf, piece, stream))
+	    break;
+	  len = strlen (input_name);
+	  if (input_name[len - 1] != '\n')
+	    {
+	      input_name = (char *)xrealloc (input_name, len + piece);
+	      buf = input_name + len;
+	      goto cont;
+	    }
+	  input_name[len - 1] = '\0';
+
+	  if (input_name[0] == '*')
+	    {
+	      continue;
+	      output_name = &input_name[1];
+	    }
+	  else
+	    {
+	      struct pex_obj *pex;
+	      const char *errmsg;
+	      int err;
+	      int status;
+
+	      /* Otherwise, add FILES[I] to lto_execute_ltrans command line
+		 and add the resulting file to LTRANS output list.  */
+
+	      /* Replace the .o suffix with a .ltrans.o suffix and write
+		 the resulting name to the LTRANS output list.  */
+	      obstack_init (&env_obstack);
+	      obstack_grow (&env_obstack, input_name, strlen (input_name) - 2);
+	      obstack_grow (&env_obstack, ".ltrans.o", sizeof (".ltrans.o"));
+	      output_name = XOBFINISH (&env_obstack, char *);
+
+	      argv_ptr[0] = "-o";
+	      argv_ptr[1] = output_name;
+	      argv_ptr[2] = input_name;
+	      argv_ptr[3] = NULL;
+
+	      /* Append a sequence number to -dumpbase for LTRANS.  */
+	      if (dumpbase_suffix)
+		snprintf (dumpbase_suffix, sizeof (DUMPBASE_SUFFIX) - 7,
+			  "%lu", (unsigned long) i);
+
+	      /* Execute the driver.  */
+	      pex = pex_init (0, "lto1", NULL);
+	      if (pex == NULL)
+		fatal ("pex_init failed: %s", xstrerror (errno));
+
+	      errmsg = pex_run (pex, PEX_LAST | PEX_SEARCH, new_argv[0],
+				CONST_CAST (char **, new_argv),
+				NULL, NULL, &err);
+	      if (errmsg)
+		fatal ("%s: %s", errmsg, xstrerror (err));
+
+	      if (!pex_get_status (pex, 1, &status))
+		fatal ("can't get program status: %s", xstrerror (errno));
+
+	      if (status)
+		{
+		  if (WIFSIGNALED (status))
+		    {
+		      int sig = WTERMSIG (status);
+		      fatal ("%s terminated with signal %d [%s]%s",
+			     new_argv[0], sig, strsignal (sig),
+			     WCOREDUMP (status) ? ", core dumped" : "");
+		    }
+		  else
+		    fatal ("%s terminated with status %d", new_argv[0], status);
+		}
+
+	      pex_free (pex);
+
+	      maybe_unlink_file (input_name);
+	    }
+
+	  fputs (output_name, stdout);
+	  putc ('\n', stdout);
+	}
       fclose (stream);
       maybe_unlink_file (ltrans_output_file);
       free (list_option_full);
+      obstack_free (&env_obstack, NULL);
     }
   else
     fatal ("invalid LTO mode");
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 0ff5222..5bbb2e3 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,10 +1,21 @@
+2010-05-07  Richard Guenther  <rguenther@suse.de>
+
+	* lto.c (DUMPBASE_SUFFIX): Remove.
+	(lto_execute_ltrans): Move functionality to lto-wrapper.c.
+	Rename to ...
+	(lto_write_ltrans_list): ... only output the list of ltrans files.
+	(lto_maybe_unlink): Remove.
+	(do_whole_program_analysis): Do not execute LTRANS phase
+	from here.
+
 2010-05-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* lto-lang.c (lto_handle_option): Add argument kind.
 
 2010-05-05  Jan Hubicka  <jh@suse.cz>
 
-	* lto.c (lto_promote_cross_file_statics): Compute boundary based on refs.
+	* lto.c (lto_promote_cross_file_statics): Compute boundary based on
+	refs.
 
 2010-05-05  Jan Hubicka  <jh@suse.cz>
 
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 44b4a84..c83bfb0 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -973,187 +973,39 @@ lto_wpa_write_files (void)
   return output_files;
 }
 
-/* Template of LTRANS dumpbase suffix.  */
-#define DUMPBASE_SUFFIX	".ltrans18446744073709551615"
-
 /* Perform local transformations (LTRANS) on the files in the NULL-terminated
    FILES array.  These should have been written previously by
    lto_wpa_write_files ().  Transformations are performed via executing
    COLLECT_GCC for reach file.  */
 
 static void
-lto_execute_ltrans (char *const *files)
+lto_write_ltrans_list (char *const *files)
 {
-  struct pex_obj *pex;
-  const char *collect_gcc_options, *collect_gcc;
-  struct obstack env_obstack;
-  const char **argv;
-  const char **argv_ptr;
-  const char *errmsg;
-  size_t i, j;
-  int err;
-  int status;
   FILE *ltrans_output_list_stream = NULL;
-  bool seen_dumpbase = false;
-  char *dumpbase_suffix = NULL;
-
-  timevar_push (TV_WHOPR_WPA_LTRANS_EXEC);
-
-  /* Get the driver and options.  */
-  collect_gcc = getenv ("COLLECT_GCC");
-  if (!collect_gcc)
-    fatal_error ("environment variable COLLECT_GCC must be set");
-
-  /* Set the CFLAGS environment variable.  */
-  collect_gcc_options = getenv ("COLLECT_GCC_OPTIONS");
-  if (!collect_gcc_options)
-    fatal_error ("environment variable COLLECT_GCC_OPTIONS must be set");
-
-  /* Count arguments.  */
-  i = 0;
-  for (j = 0; collect_gcc_options[j] != '\0'; ++j)
-    if (collect_gcc_options[j] == '\'')
-      ++i;
-
-  if (i % 2 != 0)
-    fatal_error ("malformed COLLECT_GCC_OPTIONS");
-
-  /* Initalize the arguments for the LTRANS driver.  */
-  argv = XNEWVEC (const char *, 8 + i / 2);
-  argv_ptr = argv;
-  *argv_ptr++ = collect_gcc;
-  *argv_ptr++ = "-xlto";
-  for (j = 0; collect_gcc_options[j] != '\0'; ++j)
-    if (collect_gcc_options[j] == '\'')
-      {
-	char *option;
-
-	++j;
-	i = j;
-	while (collect_gcc_options[j] != '\'')
-	  ++j;
-	obstack_init (&env_obstack);
-	obstack_grow (&env_obstack, &collect_gcc_options[i], j - i);
-	if (seen_dumpbase)
-	  obstack_grow (&env_obstack, DUMPBASE_SUFFIX,
-			sizeof (DUMPBASE_SUFFIX));
-	else
-	  obstack_1grow (&env_obstack, 0);
-	option = XOBFINISH (&env_obstack, char *);
-	if (seen_dumpbase)
-	  {
-	    dumpbase_suffix = option + 7 + j - i;
-	    seen_dumpbase = false;
-	  }
-
-	/* LTRANS does not need -fwpa nor -fltrans-*.  */
-	if (strncmp (option, "-fwpa", 5) != 0
-	    && strncmp (option, "-fltrans-", 9) != 0)
-	  {
-	    if (strncmp (option, "-dumpbase", 9) == 0)
-	      seen_dumpbase = true;
-	    *argv_ptr++ = option;
-	  }
-      }
-  *argv_ptr++ = "-fltrans";
+  unsigned i;
 
   /* Open the LTRANS output list.  */
-  if (ltrans_output_list)
-    {
-      ltrans_output_list_stream = fopen (ltrans_output_list, "w");
-      if (ltrans_output_list_stream == NULL)
-	error ("opening LTRANS output list %s: %m", ltrans_output_list);
-    }
+  if (!ltrans_output_list)
+    error ("no LTRANS output filename provided");
+
+  ltrans_output_list_stream = fopen (ltrans_output_list, "w");
+  if (ltrans_output_list_stream == NULL)
+    error ("opening LTRANS output list %s: %m", ltrans_output_list);
 
   for (i = 0; files[i]; ++i)
     {
       size_t len;
 
-      /* If the file is prefixed with a '*', it means that we do not
-	 need to re-compile it with LTRANS because it has not been
-	 modified by WPA.  Skip it from the command line to
-	 lto_execute_ltrans, but add it to ltrans_output_list_stream
-	 so it is linked after we are done.  */
-      if (files[i][0] == '*')
-	{
-	  size_t len = strlen (files[i]) - 1;
-	  if (ltrans_output_list_stream)
-	    if (fwrite (&files[i][1], 1, len, ltrans_output_list_stream) < len
-		|| fwrite ("\n", 1, 1, ltrans_output_list_stream) < 1)
-	      error ("writing to LTRANS output list %s: %m",
-		     ltrans_output_list);
-	}
-      else
-	{
-	  char *output_name;
-
-	  /* Otherwise, add FILES[I] to lto_execute_ltrans command line
-	     and add the resulting file to LTRANS output list.  */
-
-	  /* Replace the .o suffix with a .ltrans.o suffix and write
-	     the resulting name to the LTRANS output list.  */
-	  obstack_init (&env_obstack);
-	  obstack_grow (&env_obstack, files[i], strlen (files[i]) - 2);
-	  obstack_grow (&env_obstack, ".ltrans.o", sizeof (".ltrans.o"));
-	  output_name = XOBFINISH (&env_obstack, char *);
-	  if (ltrans_output_list_stream)
-	    {
-	      len = strlen (output_name);
-
-	      if (fwrite (output_name, 1, len, ltrans_output_list_stream) < len
-		  || fwrite ("\n", 1, 1, ltrans_output_list_stream) < 1)
-		error ("writing to LTRANS output list %s: %m",
-		       ltrans_output_list);
-	    }
-
-	  argv_ptr[0] = "-o";
-	  argv_ptr[1] = output_name;
-	  argv_ptr[2] = files[i];
-	  argv_ptr[3] = NULL;
-
-	  /* Append a sequence number to -dumpbase for LTRANS.  */
-	  if (dumpbase_suffix)
-	    snprintf (dumpbase_suffix, sizeof (DUMPBASE_SUFFIX) - 7,
-		      "%lu", (unsigned long) i);
-
-	  /* Execute the driver.  */
-	  pex = pex_init (0, "lto1", NULL);
-	  if (pex == NULL)
-	    fatal_error ("pex_init failed: %s", xstrerror (errno));
-
-	  errmsg = pex_run (pex, PEX_LAST | PEX_SEARCH, argv[0],
-			    CONST_CAST (char **, argv), NULL, NULL, &err);
-	  if (errmsg)
-	    fatal_error ("%s: %s", errmsg, xstrerror (err));
-
-	  if (!pex_get_status (pex, 1, &status))
-	    fatal_error ("can't get program status: %s", xstrerror (errno));
-
-	  if (status)
-	    {
-	      if (WIFSIGNALED (status))
-		{
-		  int sig = WTERMSIG (status);
-		  fatal_error ("%s terminated with signal %d [%s]%s",
-			       argv[0], sig, strsignal (sig),
-			       WCOREDUMP (status) ? ", core dumped" : "");
-		}
-	      else
-		fatal_error ("%s terminated with status %d", argv[0], status);
-	    }
-
-	  pex_free (pex);
-	}
+      len = strlen (files[i]);
+      if (fwrite (files[i], 1, len, ltrans_output_list_stream) < len
+	  || fwrite ("\n", 1, 1, ltrans_output_list_stream) < 1)
+	error ("writing to LTRANS output list %s: %m",
+	       ltrans_output_list);
     }
 
   /* Close the LTRANS output list.  */
-  if (ltrans_output_list_stream && fclose (ltrans_output_list_stream))
+  if (fclose (ltrans_output_list_stream))
     error ("closing LTRANS output list %s: %m", ltrans_output_list);
-
-  obstack_free (&env_obstack, NULL);
-  free (argv);
-
-  timevar_pop (TV_WHOPR_WPA_LTRANS_EXEC);
 }
 
 
@@ -1616,20 +1468,6 @@ lto_fixup_decls (struct lto_file_decl_data **files)
   pointer_set_destroy (seen);
 }
 
-/* Unlink a temporary LTRANS file unless requested otherwise.  */
-
-static void
-lto_maybe_unlink (const char *file)
-{
-  if (!getenv ("WPA_SAVE_LTRANS"))
-    {
-      if (unlink_if_ordinary (file))
-        error ("deleting LTRANS input file %s: %m", file);
-    }
-  else
-    fprintf (stderr, "[Leaving LTRANS input file %s]\n", file);
-}
-
 /* Read the options saved from each file in the command line.  Called
    from lang_hooks.post_options which is called by process_options
    right before all the options are used to initialize the compiler.
@@ -1893,7 +1731,6 @@ static void
 do_whole_program_analysis (void)
 {
   char **output_files;
-  size_t i;
 
   /* Note that since we are in WPA mode, materialize_cgraph will not
      actually read in all the function bodies.  It only materializes
@@ -1944,15 +1781,7 @@ do_whole_program_analysis (void)
   if (flag_lto_report)
     print_lto_report ();
 
-  lto_execute_ltrans (output_files);
-
-  for (i = 0; output_files[i]; ++i)
-    {
-      if (output_files[i][0] != '*')
-	lto_maybe_unlink (output_files[i]);
-
-      free (output_files[i]);
-    }
+  lto_write_ltrans_list (output_files);
 
   XDELETEVEC (output_files);
 }