From: Tom Tromey <tromey@adacore.com>
Date: Tue, 23 Jan 2024 17:25:33 +0000 (-0700)
Subject: Clean up suppress_new_breakpoint_event
X-Git-Tag: gdb-15-branchpoint~991
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95fc420a40ebcbd510b41df77b93b11ec819f0a1;p=thirdparty%2Fbinutils-gdb.git

Clean up suppress_new_breakpoint_event

Kévin pointed out that suppress_new_breakpoint_event would do the
wrong thing if it happened to be used reentrantly.  While I don't
think this can happen, it's also easy and clearly better to make it
robust.
---

diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py
index 9cbd7ae0c47..87e746472fb 100644
--- a/gdb/python/lib/gdb/dap/breakpoint.py
+++ b/gdb/python/lib/gdb/dap/breakpoint.py
@@ -47,11 +47,12 @@ _suppress_bp = False
 def suppress_new_breakpoint_event():
     """Return a new context manager that suppresses new breakpoint events."""
     global _suppress_bp
+    saved = _suppress_bp
     _suppress_bp = True
     try:
         yield None
     finally:
-        _suppress_bp = False
+        _suppress_bp = saved
 
 
 @in_gdb_thread