Fix failure with C++ exceptions in DAP

While working on earlier patches, I noticed that the DAP C++ exception
test had some strange results in the log.  Digging into this, I found
that while the Ada catchpoints emit a "bkptno" field in the MI result,
the C++ ones do not -- but the DAP code was relying on this.

This patch fixes the problem by changing which field is examined, and
then updates the tests to verify this.

Reviewed-by: Keith Seitz <keiths@redhat.com>

diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py
index d44e50b0056f18d11bb72a3751037014dfaff60e..db8ac10af6e10637958cd676d8e27a0f42af6ea9 100644 (file)
--- a/gdb/python/lib/gdb/dap/breakpoint.py
+++ b/gdb/python/lib/gdb/dap/breakpoint.py
@@ -381,9 +381,12 @@ def _catch_exception(filterId, **args):
     else:
         raise DAPException("Invalid exception filterID: " + str(filterId))
     result = exec_mi_and_log(cmd)
+    # While the Ada catchpoints emit a "bkptno" field here, the C++
+    # ones do not.  So, instead we look at the "number" field.
+    num = result["bkpt"]["number"]
     # A little lame that there's no more direct way.
     for bp in gdb.breakpoints():
-        if bp.number == result["bkptno"]:
+        if bp.number == num:
             return bp
     # Not a DAPException because this is definitely unexpected.
     raise Exception("Could not find catchpoint after creating")

diff --git a/gdb/testsuite/gdb.dap/catch-exception.exp b/gdb/testsuite/gdb.dap/catch-exception.exp
index 166b862f9a7dfed31e5e5073ee2f89adba39e318..a1ced06cad2d108983452b391650e6f6c6c685a3 100644 (file)
--- a/gdb/testsuite/gdb.dap/catch-exception.exp
+++ b/gdb/testsuite/gdb.dap/catch-exception.exp
@@ -57,6 +57,12 @@ foreach spec $bps {
            gdb_assert {[dict get $spec source path] != "null"} \
                "breakpoint $i path"
        }
+
+       # Breakpoint should be unverified and pending.
+       gdb_assert {[dict get $spec verified] == "false"} \
+           "catchpoint $i is unverified"
+       gdb_assert {[dict get $spec reason] == "pending"} \
+           "catchpoint $i is pending"
     }
     incr i
 }

diff --git a/gdb/testsuite/gdb.dap/cxx-exception.exp b/gdb/testsuite/gdb.dap/cxx-exception.exp
index b54b11a2c9afc8b8cebf50134c6256fb1aaaba7c..13320439b6d5b9343a806ea9a4bd19cc052a3ff0 100644 (file)
--- a/gdb/testsuite/gdb.dap/cxx-exception.exp
+++ b/gdb/testsuite/gdb.dap/cxx-exception.exp
@@ -37,6 +37,16 @@ set bps [dict get [lindex $obj 0] body breakpoints]
 # breakpoints.
 gdb_assert {[llength $bps] == 3} "three breakpoints"
 
+# Each breakpoint should be unverified and pending.
+foreach bp $bps {
+    with_test_prefix [dict get $bp id] {
+       gdb_assert {[dict get $bp verified] == "false"} \
+           "catchpoint is unverified"
+       gdb_assert {[dict get $bp reason] == "pending"} \
+           "catchpoint is pending"
+    }
+}
+
 dap_check_request_and_response "configurationDone" configurationDone
 
 if {[dap_launch $testfile] == ""} {