re PR lto/43857 (-fresolution causes an ICE)

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

	* gcc.c (LINK_COMMAND_SPEC): Provide a resolution file to
	the linker plugin.
	(store_arg): Queue temp_filename for deletion instead of
	the whole argument.

	lto/
	PR lto/43857
	PR lto/43371
	* lang.opt (fresolution): Change to ...
	(fresolution=): ... this.
	* lto-lang.c (lto_handle_option): Adjust.

	lto-plugin/
	* lto-plugin.c (free_2): Do not free resolution_file.
	(write_resolution): Check that we were passed a resolution file.
	(all_symbols_read_handler): Adjust.
	(cleanup_handler): Do not remove the resolution file.
	(process_option): Handle -fresolution=.

From-SVN: r159159

5 files changed, 37 insertions, 21 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d334f63..486a713 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-07  Richard Guenther <rguenther@suse.de>
+
+	* gcc.c (LINK_COMMAND_SPEC): Provide a resolution file to
+	the linker plugin.
+	(store_arg): Queue temp_filename for deletion instead of
+	the whole argument.
+
 2010-05-07  Richard Guenther  <rguenther@suse.de>
 
 	* lto-wrapper.c (DUMPBASE_SUFFIX): Define.
diff --git a/gcc/gcc.c b/gcc/gcc.c
index a25077e..7e4343d 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -782,6 +782,7 @@ proper position among the other output files.  */
     -plugin %(linker_plugin_file) \
     -plugin-opt=%(lto_wrapper) \
     -plugin-opt=%(lto_gcc) \
+    -plugin-opt=-fresolution=%u.res \
     %{static|static-libgcc:-plugin-opt=-pass-through=%(lto_libgcc)}	\
     %{static:-plugin-opt=-pass-through=-lc}	\
     %{O*:-plugin-opt=-O%*} \
@@ -2044,6 +2045,23 @@ static int signal_count;
 /* Name with which this program was invoked.  */
 
 static const char *programname;
+
+/* This is the common prefix we use to make temp file names.
+   It is chosen once for each run of this program.
+   It is substituted into a spec by %g or %j.
+   Thus, all temp file names contain this prefix.
+   In practice, all temp file names start with this prefix.
+
+   This prefix comes from the envvar TMPDIR if it is defined;
+   otherwise, from the P_tmpdir macro if that is defined;
+   otherwise, in /usr/tmp or /tmp;
+   or finally the current directory if all else fails.  */
+
+static const char *temp_filename;
+
+/* Length of the prefix.  */
+
+static int temp_filename_length;
 
 /* Allocate the argument vector.  */
 
@@ -2081,7 +2099,7 @@ store_arg (const char *arg, int delete_always, int delete_failure)
   if (strcmp (arg, "-o") == 0)
     have_o_argbuf_index = argbuf_index;
   if (delete_always || delete_failure)
-    record_temp_file (arg, delete_always, delete_failure);
+    record_temp_file (temp_filename, delete_always, delete_failure);
 }
 
 /* Load specs from a file name named FILENAME, replacing occurrences of
@@ -2384,23 +2402,6 @@ read_specs (const char *filename, int main_p)
 /* Record the names of temporary files we tell compilers to write,
    and delete them at the end of the run.  */
 
-/* This is the common prefix we use to make temp file names.
-   It is chosen once for each run of this program.
-   It is substituted into a spec by %g or %j.
-   Thus, all temp file names contain this prefix.
-   In practice, all temp file names start with this prefix.
-
-   This prefix comes from the envvar TMPDIR if it is defined;
-   otherwise, from the P_tmpdir macro if that is defined;
-   otherwise, in /usr/tmp or /tmp;
-   or finally the current directory if all else fails.  */
-
-static const char *temp_filename;
-
-/* Length of the prefix.  */
-
-static int temp_filename_length;
-
 /* Define the list of temporary files to delete.  */
 
 struct temp_file
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 5bbb2e3..2496d66 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-07  Richard Guenther <rguenther@suse.de>
+
+	PR lto/43857
+	PR lto/43371
+	* lang.opt (fresolution): Change to ...
+	(fresolution=): ... this.
+	* lto-lang.c (lto_handle_option): Adjust.
+
 2010-05-07  Richard Guenther  <rguenther@suse.de>
 
 	* lto.c (DUMPBASE_SUFFIX): Remove.
diff --git a/gcc/lto/lang.opt b/gcc/lto/lang.opt
index a8b7916..53ab8e8 100644
--- a/gcc/lto/lang.opt
+++ b/gcc/lto/lang.opt
@@ -36,8 +36,8 @@ fwpa
 LTO Report Var(flag_wpa) Optimization
 Run the link-time optimizer in whole program analysis (WPA) mode.
 
-fresolution
-LTO Separate
+fresolution=
+LTO Joined
 The resolution file
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 4c90721..72149082 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -624,7 +624,7 @@ lto_handle_option (size_t scode, const char *arg,
 
   switch (code)
     {
-    case OPT_fresolution:
+    case OPT_fresolution_:
       resolution_file_name = arg;
       result = 1;
       break;