From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=iaFn=ML=xry111.site=xry111@sourceware.org>
Received: from xry111.site (xry111.site [89.208.246.23])
	by sourceware.org (Postfix) with ESMTPS id 7FF053882105
	for <gcc-patches@gcc.gnu.org>; Wed,  8 May 2024 05:51:35 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7FF053882105
Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=xry111.site
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xry111.site
ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7FF053882105
Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=89.208.246.23
ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715147499; cv=none;
	b=a8kranOML+OLFzVbIjnU5Jj96oBSpX+A3GgkalmrPo87NxLzOSu5pCmiBSulK04KDe8ziitUaXoDyOXKLf4rBimTyHft/KuvIqz+8oIKBcU0LQqgoIzMK7Wdo621/ujg6GujSc7TLVVzoqyGuY11WEA0VIvqPRCfNp2bp8GTFRg=
ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key;
	t=1715147499; c=relaxed/simple;
	bh=u7+MKJApwqz/+g8JcKdP9lyWWEc1U815cEPoFUGt8Wc=;
	h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Wmb38MiYfGRafrPiQCZOpAfcghBaPGRb+5mgS62IHnj5oG7FEytm3weZeQWoAK8sIBke7XheVP/B1o0aq1cQ9hDGPmW4NAsby6wSPuVNtx57ZvWJ3xwOwkY2UPMzIGyCreSbQzJXlz4ph7/+oEGZ9EerO1qPeseM9K2kLbUlCCQ=
ARC-Authentication-Results: i=1; server2.sourceware.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site;
	s=default; t=1715147493;
	bh=u7+MKJApwqz/+g8JcKdP9lyWWEc1U815cEPoFUGt8Wc=;
	h=From:To:Cc:Subject:Date:From;
	b=mVmKpEuO/i/b9XXNuIhTKYJY1FIyHu9rtSsprNgx8tsFgZx3slSfA2RhehJTs/1CE
	 8ii8L4gixgVy72GpmDUrJ+P1m86VpW2hEktFz74MTI6U/ckqNsbwv3MltuhtYTbGze
	 htc1wChEji2N7fwg58Tova0WJeyWkKCleU7HivcE=
Received: from stargazer.. (unknown [IPv6:240e:358:11f4:b00:dc73:854d:832e:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384)
	(Client did not present a certificate)
	(Authenticated sender: xry111@xry111.site)
	by xry111.site (Postfix) with ESMTPSA id 6D4FA66FD7;
	Wed,  8 May 2024 01:51:31 -0400 (EDT)
From: Xi Ruoyao <xry111@xry111.site>
To: gcc-patches@gcc.gnu.org
Cc: Jakub Jelinek <jakub@redhat.com>,
	David Malcolm <dmalcolm@redhat.com>,
	Xi Ruoyao <xry111@xry111.site>
Subject: [PATCH] driver: Move -fdiagnostics-urls= early like -fdiagnostics-color= [PR114980]
Date: Wed,  8 May 2024 13:50:20 +0800
Message-ID: <20240508055019.3460409-2-xry111@xry111.site>
X-Mailer: git-send-email 2.45.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,LIKELY_SPAM_FROM,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <gcc-patches.gcc.gnu.org>

In GCC 14 we started to emit URLs for "command-line option <option> is
valid for <language> but not <another language>" and "-Werror= argument
'-Werror=<option>' is not valid for <language>" warnings.  So we should
have moved -fdiagnostics-urls= early like -fdiagnostics-color=, or
-fdiagnostics-urls= wouldn't be able to control URLs in these warnings.

No test cases are added because with TERM=xterm-256colors PR114980
already triggers some test failures.

gcc/ChangeLog:

	PR driver/114980
	* opts-common.cc (prune_options): Move -fdiagnostics-urls=
	early like -fdiagnostics-color=.
---

Bootstrapped and regtested on x86_64-linux-gnu.  Ok for trunk and
releases/gcc-14?

 gcc/opts-common.cc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc
index 4a2dff243b0..2d1e86ff94f 100644
--- a/gcc/opts-common.cc
+++ b/gcc/opts-common.cc
@@ -1152,6 +1152,7 @@ prune_options (struct cl_decoded_option **decoded_options,
   unsigned int options_to_prepend = 0;
   unsigned int Wcomplain_wrong_lang_idx = 0;
   unsigned int fdiagnostics_color_idx = 0;
+  unsigned int fdiagnostics_urls_idx = 0;
 
   /* Remove arguments which are negated by others after them.  */
   new_decoded_options_count = 0;
@@ -1185,6 +1186,12 @@ prune_options (struct cl_decoded_option **decoded_options,
 	    ++options_to_prepend;
 	  fdiagnostics_color_idx = i;
 	  continue;
+	case OPT_fdiagnostics_urls_:
+	  gcc_checking_assert (i != 0);
+	  if (fdiagnostics_urls_idx == 0)
+	    ++options_to_prepend;
+	  fdiagnostics_urls_idx = i;
+	  continue;
 
 	default:
 	  gcc_assert (opt_idx < cl_options_count);
@@ -1248,6 +1255,12 @@ keep:
 	    = old_decoded_options[fdiagnostics_color_idx];
 	  new_decoded_options_count++;
 	}
+      if (fdiagnostics_urls_idx != 0)
+	{
+	  new_decoded_options[argv_0 + options_prepended++]
+	    = old_decoded_options[fdiagnostics_urls_idx];
+	  new_decoded_options_count++;
+	}
       gcc_checking_assert (options_to_prepend == options_prepended);
     }
 
-- 
2.45.0