From: Jason Merrill <jason@redhat.com>
Date: Thu, 3 Nov 2022 19:44:25 +0000 (-0400)
Subject: input: rename get_source to get_source_text_between
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dbd1db4df283b73fe8e9c181d37a0754e429fac;p=thirdparty%2Fgcc.git

input: rename get_source to get_source_text_between

Let's use a more informative name.

gcc/ChangeLog:

	* input.h:
	* input.cc (get_source):
	Rename to get_source_text_between.

gcc/cp/ChangeLog:

	* contracts.cc (build_comment): Adjust.
---

diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
index 38eb4ad9bfe9..793743442073 100644
--- a/gcc/cp/contracts.cc
+++ b/gcc/cp/contracts.cc
@@ -723,7 +723,8 @@ build_comment (cp_expr condition)
 {
   /* Try to get the actual source text for the condition; if that fails pretty
      print the resulting tree.  */
-  char *str = get_source (condition.get_start (), condition.get_finish ());
+  char *str = get_source_text_between (condition.get_start (),
+				       condition.get_finish ());
   if (!str)
     {
       /* FIXME cases where we end up here
diff --git a/gcc/input.cc b/gcc/input.cc
index 7166c8108925..9b36356338ac 100644
--- a/gcc/input.cc
+++ b/gcc/input.cc
@@ -949,10 +949,11 @@ location_get_source_line (const char *file_path, int line)
   return char_span (buffer, len);
 }
 
-/* Return the source text between two locations.  */
+/* Return a copy of the source text between two locations.  The caller is
+   responsible for freeing the return value.  */
 
 char *
-get_source (location_t start, location_t end)
+get_source_text_between (location_t start, location_t end)
 {
   expanded_location expstart =
     expand_location_to_spelling_point (start, LOCATION_ASPECT_START);
diff --git a/gcc/input.h b/gcc/input.h
index c97768ad2f37..f18769950b5a 100644
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -111,7 +111,7 @@ class char_span
 };
 
 extern char_span location_get_source_line (const char *file_path, int line);
-extern char *get_source (location_t, location_t);
+extern char *get_source_text_between (location_t, location_t);
 
 extern bool location_missing_trailing_newline (const char *file_path);