[gcc r13-9600] Fix up some further cases of missing or extraneous spaces in diagnostics

[Jakub Jelinek via Gcc-cvs]

https://gcc.gnu.org/g:6eb9f800810a89becb55690d80f1baf54b4cc966

commit r13-9600-g6eb9f800810a89becb55690d80f1baf54b4cc966
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Sat Mar 22 08:39:38 2025 +0100

    Fix up some further cases of missing or extraneous spaces in diagnostics
    
    Given the recent PR119406 I've tried to grep for concatenated string
    literals without space at the end of one line and at the start of next line,
    unless it was obviously intentional.
    Furthermore, I've then looked through gcc.pot looking for 2 adjacent spaces
    and looking back if that wasn't the case of "something "
    " with spaces at both sides".
    
    Here is the result from that.
    
    I think just the c.opt change needs an explanation, the "" in the
    description is simply eaten up somewhere during the option processing and
    gcc -v --help before this patch was displaying
      -Wdeprecated-literal-operator Warn about deprecated space between  and 
suffix in a user-defined literal operator.
    
    2025-03-22  Jakub Jelinek  <ja...@redhat.com>
    
    gcc/
            * gimplify.cc (warn_switch_unreachable_and_auto_init_r): Add missing
            space in the middle of diagnostics.
    gcc/fortran/
            * resolve.cc (resolve_procedure_expression): Remove extraneous space
            from the middle of diagnostics.
    
    (cherry picked from commit 20360e4b6b5a63bc65d1855a7ecf22eb7148a452)

Diff:
---
 gcc/fortran/resolve.cc | 2 +-
 gcc/gimplify.cc        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index b9c027ccc0f0..9152b3c1d335 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -1955,7 +1955,7 @@ resolve_procedure_expression (gfc_expr* expr)
   if (is_illegal_recursion (sym, gfc_current_ns))
     {
       if (sym->attr.use_assoc && expr->symtree->name[0] == '@')
-       gfc_warning (0, "Non-RECURSIVE procedure %qs from module %qs is "
+       gfc_warning (0, "Non-RECURSIVE procedure %qs from module %qs is"
                     " possibly calling itself recursively in procedure %qs. "
                     " Declare it RECURSIVE or use %<-frecursive%>",
                     sym->name, sym->module, gfc_current_ns->proc_name->name);
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index f855252475f1..bb9086bb213e 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -2129,7 +2129,7 @@ warn_switch_unreachable_and_auto_init_r 
(gimple_stmt_iterator *gsi_p,
          const char *var_name_str = TREE_STRING_POINTER (var_name);
 
          warning_at (gimple_location (stmt), OPT_Wtrivial_auto_var_init,
-                     "%qs cannot be initialized with"
+                     "%qs cannot be initialized with "
                      "%<-ftrivial-auto-var_init%>",
                      var_name_str);
          break;