[gcc(refs/users/marxin/heads/PR104333-lto-error-handling)] lto: fix error handling for -Wl, -plugin-opt=debug

[gcc(refs/users/marxin/heads/PR104333-lto-error-handling)] lto: fix error handling for -Wl, -plugin-opt=debug

[Martin Liska]

https://gcc.gnu.org/g:818e357c9a0fd984bfe48e1fedb36e6e9577cd85

commit 818e357c9a0fd984bfe48e1fedb36e6e9577cd85
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Feb 2 14:21:51 2022 +0100

    lto: fix error handling for -Wl,-plugin-opt=debug
    
    When one uses something like: -Wl,-plugin-opt=debug,
    we end up with lto1 WPA invocation that has 'debug'
    on command line. We interpret that as input filename.
    
    The patch moves resolution checking later so that we end up with
    a reasonable error message:
    
    lto1: error: open debug failed: No such file or directory
    lto1: fatal error: errors during merging of translation units
    
            PR lto/104333
    
    gcc/lto/ChangeLog:
    
            * lto-common.cc (read_cgraph_and_symbols): Move resolution
            checking for number of files later and report a reasonable
            error message.

Diff:
---
 gcc/lto/lto-common.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc
index 4d6686b0b99..fbcd4742ee4 100644
--- a/gcc/lto/lto-common.cc
+++ b/gcc/lto/lto-common.cc
@@ -2704,6 +2704,7 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
 {
   unsigned int i, last_file_ix;
   FILE *resolution;
+  unsigned resolution_objects = 0;
   int count = 0;
   struct lto_file_decl_data **decl_data;
   symtab_node *snode;
@@ -2726,18 +2727,14 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   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);
+      t = fscanf (resolution, "%u", &resolution_objects);
       gcc_assert (t == 1);
-
-      /* True, since the plugin splits the archives.  */
-      gcc_assert (num_objects == nfiles);
     }
   symtab->state = LTO_STREAMING;
 
@@ -2806,7 +2803,12 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   lto_register_canonical_types_for_odr_types ();
 
   if (resolution_file_name)
-    fclose (resolution);
+    {
+      /* True, since the plugin splits the archives.  */
+      if (!seen_error ())
+	gcc_assert (resolution_objects == nfiles);
+      fclose (resolution);
+    }
 
   /* Show the LTO report before launching LTRANS.  */
   if (flag_lto_report || (flag_wpa && flag_lto_report_wpa))

[gcc(refs/users/marxin/heads/PR104333-lto-error-handling)] lto: fix error handling for -Wl, -plugin-opt=debug

[Martin Liska]

https://gcc.gnu.org/g:fd7385e495acfced416b37320b4bb7475bf2f9ff

commit fd7385e495acfced416b37320b4bb7475bf2f9ff
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Feb 2 14:21:51 2022 +0100

    lto: fix error handling for -Wl,-plugin-opt=debug
    
    When one uses something like: -Wl,-plugin-opt=debug,
    we end up with lto1 WPA invocation that has 'debug'
    on command line. We interpret that as input filename.
    
    The patch moves resolution checking later so that we end up with
    a reasonable error message:
    
    lto1: fatal error: open debug failed: No such file or directory
    compilation terminated.
    
            PR lto/104333
    
    gcc/lto/ChangeLog:
    
            * lto-common.cc (read_cgraph_and_symbols): Move resolution
            checking for number of files later and report a reasonable
            error message.
            * lto-object.cc (lto_obj_file_open): Make error fatal.

Diff:
---
 gcc/lto/lto-common.cc | 13 +++++++------
 gcc/lto/lto-object.cc |  8 ++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc
index 4d6686b0b99..11fde671162 100644
--- a/gcc/lto/lto-common.cc
+++ b/gcc/lto/lto-common.cc
@@ -2704,6 +2704,7 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
 {
   unsigned int i, last_file_ix;
   FILE *resolution;
+  unsigned resolution_objects = 0;
   int count = 0;
   struct lto_file_decl_data **decl_data;
   symtab_node *snode;
@@ -2726,18 +2727,14 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   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);
+      t = fscanf (resolution, "%u", &resolution_objects);
       gcc_assert (t == 1);
-
-      /* True, since the plugin splits the archives.  */
-      gcc_assert (num_objects == nfiles);
     }
   symtab->state = LTO_STREAMING;
 
@@ -2806,7 +2803,11 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   lto_register_canonical_types_for_odr_types ();
 
   if (resolution_file_name)
-    fclose (resolution);
+    {
+      /* True, since the plugin splits the archives.  */
+      gcc_assert (resolution_objects == nfiles);
+      fclose (resolution);
+    }
 
   /* Show the LTO report before launching LTRANS.  */
   if (flag_lto_report || (flag_wpa && flag_lto_report_wpa))
diff --git a/gcc/lto/lto-object.cc b/gcc/lto/lto-object.cc
index 6f7f96f14d9..329bbc71fd6 100644
--- a/gcc/lto/lto-object.cc
+++ b/gcc/lto/lto-object.cc
@@ -103,10 +103,7 @@ lto_obj_file_open (const char *filename, bool writable)
 		  : O_RDONLY | O_BINARY),
 		 0666);
   if (lo->fd == -1)
-    {
-      error ("open %s failed: %s", fname, xstrerror (errno));
-      goto fail;
-    }
+    fatal_error (input_location, "open %s failed: %s", fname, xstrerror (errno));
 
   if (!writable)
     {
@@ -146,13 +143,12 @@ lto_obj_file_open (const char *filename, bool writable)
 
   return &lo->base;
 
- fail_errmsg:
+fail_errmsg:
   if (err == 0)
     error ("%s: %s", fname, errmsg);
   else
     error ("%s: %s: %s", fname, errmsg, xstrerror (err));
 					 
- fail:
   if (lo->fd != -1)
     lto_obj_file_close ((lto_file *) lo);
   free (lo);