[PATCH 4/4] [gdb] Use make_scoped_restore in captured_main_1

[Tom de Vries <tdevries@suse.de>]

Use make_scoped_restore in captured_main_1 to protect a cleanup against
exceptions.

I don't think this is strictly necessary: exceptions that escape out of
captured_main_1 are printed, after which gdb exits, so the state of the
global_auto_load doesn't matter much at that point.

But using make_scoped_restore probably captures the intent better.

I used std::optional to avoid indenting the code in between the save and
restore.
---
 gdb/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gdb/main.c b/gdb/main.c
index f49d5f48c9d..ea7ecc468e6 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -652,7 +652,6 @@ captured_main_1 (struct captured_main_args *context)
   std::vector<char *> dirarg;
 
   int i;
-  int save_auto_load;
   int ret = 1;
 
   /* Check for environment variables which might cause GDB to start with
@@ -1238,8 +1237,8 @@ captured_main_1 (struct captured_main_args *context)
   /* Skip auto-loading section-specified scripts until we've sourced
      local_gdbinit (which is often used to augment the source search
      path).  */
-  save_auto_load = global_auto_load;
-  global_auto_load = 0;
+  std::optional<scoped_restore_tmpl<bool>>
+    auto_load_restore (make_scoped_restore (&global_auto_load, false));
 
   if (execarg != nullptr && symarg != nullptr && streq (execarg, symarg))
     {
@@ -1333,7 +1332,7 @@ captured_main_1 (struct captured_main_args *context)
      processed, we can read any scripts mentioned in SYMARG.
      We wait until now because it is common to add to the source search
      path in local_gdbinit.  */
-  global_auto_load = save_auto_load;
+  auto_load_restore.reset ();
   for (objfile &objfile : current_program_space->objfiles ())
     load_auto_scripts_for_objfile (objfile);
 
-- 
2.51.0