From 1cd0716eb199963ec63fcafa94699d14bbf45e01 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Fri, 24 Feb 2023 13:55:29 -0700
Subject: [PATCH] Move allocate_stub_method to stabsread.c

allocate_stub_method is only called from stabsread.c, and I don't
think it will be needed anywhere else.  So, move it and make it
static.  Tested by rebuilding.
---
 gdb/gdbtypes.c  | 20 --------------------
 gdb/gdbtypes.h  |  2 --
 gdb/stabsread.c | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 3cdde29c9be..cfd0a1b62c7 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -861,26 +861,6 @@ lookup_methodptr_type (struct type *to_type)
   return mtype;
 }
 
-/* Allocate a stub method whose return type is TYPE.  This apparently
-   happens for speed of symbol reading, since parsing out the
-   arguments to the method is cpu-intensive, the way we are doing it.
-   So, we will fill in arguments later.  This always returns a fresh
-   type.  */
-
-struct type *
-allocate_stub_method (struct type *type)
-{
-  struct type *mtype;
-
-  mtype = alloc_type_copy (type);
-  mtype->set_code (TYPE_CODE_METHOD);
-  mtype->set_length (1);
-  mtype->set_is_stub (true);
-  mtype->set_target_type (type);
-  /* TYPE_SELF_TYPE (mtype) = unknown yet */
-  return mtype;
-}
-
 /* See gdbtypes.h.  */
 
 bool
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index c4889a4a05b..52475d5afb4 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2312,8 +2312,6 @@ extern void smash_to_memberptr_type (struct type *, struct type *,
 
 extern void smash_to_methodptr_type (struct type *, struct type *);
 
-extern struct type *allocate_stub_method (struct type *);
-
 extern const char *type_name_or_error (struct type *type);
 
 struct struct_elt
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index e1597907778..73f05c44b23 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -1464,6 +1464,26 @@ error_type (const char **pp, struct objfile *objfile)
 }
 
 
+/* Allocate a stub method whose return type is TYPE.  This apparently
+   happens for speed of symbol reading, since parsing out the
+   arguments to the method is cpu-intensive, the way we are doing it.
+   So, we will fill in arguments later.  This always returns a fresh
+   type.  */
+
+static struct type *
+allocate_stub_method (struct type *type)
+{
+  struct type *mtype;
+
+  mtype = alloc_type_copy (type);
+  mtype->set_code (TYPE_CODE_METHOD);
+  mtype->set_length (1);
+  mtype->set_is_stub (true);
+  mtype->set_target_type (type);
+  /* TYPE_SELF_TYPE (mtype) = unknown yet */
+  return mtype;
+}
+
 /* Read type information or a type definition; return the type.  Even
    though this routine accepts either type information or a type
    definition, the distinction is relevant--some parts of stabsread.c
-- 
2.30.2