From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Mon, 31 Dec 2018 17:44:17 +0000 (+0000)
Subject: gdb: Remove final cleanup from find_overload_match
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=26089c494f0d6fa8d4afeab2e2e53b25d299bb9f;p=deliverable%2Fbinutils-gdb.git

gdb: Remove final cleanup from find_overload_match

This patch removes the setup of a null_cleanup in
valops.c:find_overload_match, and all the calls to do_cleanups.

gdb/ChangeLog:

	* valops.c (find_overload_match): Remove use of null_cleanup, and
	calls to do_cleanups.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e677dcde2..e3c4c533be 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-03  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* valops.c (find_overload_match): Remove use of null_cleanup, and
+	calls to do_cleanups.
+
 2019-01-03  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* compile/compile-cplus-types.c
diff --git a/gdb/valops.c b/gdb/valops.c
index 1a9d6a6f95..75ff7058b7 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -2516,8 +2516,6 @@ find_overload_match (gdb::array_view<value *> args,
   struct type *basetype = NULL;
   LONGEST boffset;
 
-  struct cleanup *all_cleanups = make_cleanup (null_cleanup, NULL);
-
   const char *obj_type_name = NULL;
   const char *func_name = NULL;
   gdb::unique_xmalloc_ptr<char> temp_func;
@@ -2547,7 +2545,6 @@ find_overload_match (gdb::array_view<value *> args,
 	  if (*valp)
 	    {
 	      *staticp = 1;
-	      do_cleanups (all_cleanups);
 	      return 0;
 	    }
 	}
@@ -2693,7 +2690,6 @@ find_overload_match (gdb::array_view<value *> args,
       if (func_name == NULL)
         {
 	  *symp = fsym;
-	  do_cleanups (all_cleanups);
           return 0;
         }
 
@@ -2820,8 +2816,6 @@ find_overload_match (gdb::array_view<value *> args,
       *objp = temp;
     }
 
-  do_cleanups (all_cleanups);
-
   switch (match_quality)
     {
     case INCOMPATIBLE: