[PATCH 1/4] [gdb] Use make_scoped_restore in z80_read_overlay_region_table

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

I came across z80_read_overlay_region_table and noticed this code:
...
   const enum overlay_debugging_state save_ovly_dbg = overlay_debugging;
   overlay_debugging = ovly_off;
   ...
   overlay_debugging = save_ovly_dbg;
...

Protect the restore of overlay_debugging against exceptions using
make_scoped_restore.
---
 gdb/z80-tdep.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index 6b995e74d9f..7822b74a78b 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -937,9 +937,9 @@ z80_read_overlay_region_table ()
       return 0;
     }
 
-  const enum overlay_debugging_state save_ovly_dbg = overlay_debugging;
   /* prevent infinite recurse */
-  overlay_debugging = ovly_off;
+  scoped_restore overlay_debugging_restore
+    = make_scoped_restore (&overlay_debugging, ovly_off);
 
   gdbarch = ovly_region_table_msym.objfile->arch ();
   word_size = gdbarch_long_bit (gdbarch) / TARGET_CHAR_BIT;
@@ -956,7 +956,6 @@ z80_read_overlay_region_table ()
 			  (unsigned int *) cache_ovly_region_table,
 			  cache_novly_regions * 3, word_size, byte_order);
 
-  overlay_debugging = save_ovly_dbg;
   return 1;                     /* SUCCESS */
 }
 
-- 
2.51.0