From: Trevor Saunders <tbsaunde@tbsaunde.org>
Date: Thu, 8 Jul 2021 01:30:03 +0000 (-0400)
Subject: use diagnostic location in diagnostic_report_current_function
X-Git-Tag: basepoints/gcc-13~5998
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329769b72001dcca18a120ab751f58de1b716ff8;p=thirdparty%2Fgcc.git

use diagnostic location in diagnostic_report_current_function

It appears that input_location was used here before the diagnostic's location
was available, and never updated, when the other part of the header was added
that uses it, so this makes it consistent.

gcc/ChangeLog:

	* tree-diagnostic.c (diagnostic_report_current_function): Use the
	diagnostic's location, not input_location.

Signed-off-by: Trevor Saunders <tbsaunde@tbsaunde.org>
---

diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c
index 8bb214b2cf52..705da94637d1 100644
--- a/gcc/tree-diagnostic.c
+++ b/gcc/tree-diagnostic.c
@@ -36,9 +36,9 @@ void
 diagnostic_report_current_function (diagnostic_context *context,
 				    diagnostic_info *diagnostic)
 {
-  diagnostic_report_current_module (context, diagnostic_location (diagnostic));
-  lang_hooks.print_error_function (context, LOCATION_FILE (input_location),
-				   diagnostic);
+  location_t loc = diagnostic_location (diagnostic);
+  diagnostic_report_current_module (context, loc);
+  lang_hooks.print_error_function (context, LOCATION_FILE (loc), diagnostic);
 }
 
 static void