From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 22 Mar 2025 07:39:38 +0000 (+0100)
Subject: Fix up some further cases of missing or extraneous spaces in diagnostics
X-Git-Tag: releases/gcc-14.3.0~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9dab50e6e5e0ecd1f004432749b43b3caab059c;p=thirdparty%2Fgcc.git

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  <jakub@redhat.com>

gcc/
	* gimplify.cc (warn_switch_unreachable_and_auto_init_r): Add missing
	space in the middle of diagnostics.
	* tree-vect-stmts.cc (vectorizable_load): Add missing space in the
	middle of debug dump message.
gcc/fortran/
	* resolve.cc (resolve_procedure_expression): Remove extraneous space
	from the middle of diagnostics.

(cherry picked from commit 20360e4b6b5a63bc65d1855a7ecf22eb7148a452)
---

diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index 7df879bf158..6a47550b613 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -1968,7 +1968,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 401b663591f..32ecb0cffe5 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -2359,7 +2359,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;
diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index a78f1d0e2cc..5b910b30196 100644
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -11916,7 +11916,7 @@ vectorizable_load (vec_info *vinfo,
 
 		  if (dump_enabled_p ())
 		    dump_printf_loc (MSG_NOTE, vect_location,
-				     "vect_model_load_cost:"
+				     "vect_model_load_cost: "
 				     "strided group_size = %d .\n",
 				     group_size);
 		}