From 238dc9af03392ecd8129ee54a340efd736782cf9 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedro@palves.net>
Date: Fri, 27 May 2022 16:28:29 +0100
Subject: [PATCH] Convert location_spec_empty_p to a method

This converts location_spec_empty_p to a method of location_spec,
simplifying users, as they no longer have to use
std::unique_ptr::get().

Change-Id: I83381a729896f12e1c5a1b4d6d4c2eb1eb6582ff
---
 gdb/breakpoint.c |  3 +--
 gdb/location.c   | 10 +---------
 gdb/location.h   |  4 ----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 7e008ba87a4..bfa9e68fdbe 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3699,8 +3699,7 @@ create_exception_master_breakpoint (void)
 static int
 breakpoint_location_spec_empty_p (const struct breakpoint *b)
 {
-  return (b->locspec != nullptr
-	  && location_spec_empty_p (b->locspec.get ()));
+  return (b->locspec != nullptr && b->locspec->empty_p ());
 }
 
 void
diff --git a/gdb/location.c b/gdb/location.c
index 19b58ab4f5b..ae056f35296 100644
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -855,7 +855,7 @@ string_to_location_spec (const char **stringp,
 
       /* If the user really specified a location spec, then we're
 	 done.  */
-      if (!location_spec_empty_p (locspec.get ()))
+      if (!locspec->empty_p ())
 	return locspec;
 
       /* Otherwise, the user _only_ specified optional flags like
@@ -876,14 +876,6 @@ string_to_location_spec (const char **stringp,
 
 /* See description in location.h.  */
 
-int
-location_spec_empty_p (const location_spec *locspec)
-{
-  return locspec->empty_p ();
-}
-
-/* See description in location.h.  */
-
 void
 set_location_spec_string (struct location_spec *locspec,
 			  std::string &&string)
diff --git a/gdb/location.h b/gdb/location.h
index 8275fa9c731..f3b63320c2e 100644
--- a/gdb/location.h
+++ b/gdb/location.h
@@ -363,10 +363,6 @@ extern location_spec_up
 				    const struct language_defn *language,
 				    explicit_completion_info *completion_info);
 
-/* A convenience function for testing for unset location specs.  */
-
-extern int location_spec_empty_p (const location_spec *locspec);
-
 /* Set the location specs's string representation.  */
 
 extern void set_location_spec_string (struct location_spec *locspec,
-- 
2.30.2