From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by sourceware.org (Postfix) with ESMTPS id 4D9F5385AF94 for ; Tue, 25 Jul 2023 16:49:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D9F5385AF94 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-34896a1574dso32396935ab.0 for ; Tue, 25 Jul 2023 09:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1690303755; x=1690908555; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=H5KY1cz6HPB85OjfCIrRjE9boYiiPaoVV/RUZ4t4Gog=; b=TuCnc/C2qANm+oo9i+HEloAgX1ulG/CylgHAcwOgjrTVpCopTHxNrOVocbuuO2NJim 8He6tRp1q9Fi6Mny9//OVyYxqAjF4OSnR/EXxP5G3QS+gtno/wuJhSJ9BRDz22PXis5i onkD5pr9OpVfj3oERwiNhBR9uARIUgJJUZftW7gbFFGX1RpiJtCFwg4UcUEU/CEyfTxX lKZ0fie0Y2kuV4rguYma3KOCfeHBFdrfKWKwSNbk9b+IY+0B5+36ToaldFtrsdvK3cB8 aYbQ+EknhJdEiZYyvJtKtlBkul4kcNZ9aKWpb0Wd7AoDhDQUVidJA/BB079NdyHnf4G7 y2NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690303755; x=1690908555; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H5KY1cz6HPB85OjfCIrRjE9boYiiPaoVV/RUZ4t4Gog=; b=LQcILM+wrz/NXoDvVtY9oYXeB9304FyfsO1Gx0LGGAoYCzSqrHqhvrZoM6pFUg6GhJ 5tAZQxwOf5bImqRRIceq1XUT/fU48maqEXmrZ9A7c0AyvbEpTDMVRSHEA6PgFw3vKvWJ F7M8Rn4d9qNgYcRVcPdPOYCW+sP2RgTnXpKkGms5S+WKUrHEl//M+rw7XAQuCl9lXv2P o/7Lnlkd5FWVVwSFWGTo2W5iCe/EXIa/c5pAGGMnIV4Gc9cy85/Iw7n7I4ixp/8fVLVN NKc8wLJHI4H4+XowwGhPHpANlJwM4VIpFaVHFZgJC87a+S74KA2c2AzKl+WJSBxeH6UH QOWg== X-Gm-Message-State: ABy/qLbcgpU8jOJdgvV2ylDsL2AC9d5WKwrkUBOQV9A4ndVZE0PqTozs pWSUL0T/NU7XkRfDtyDdrhusPS7DNQ8mXW6NwFwfZg== X-Google-Smtp-Source: APBJJlG0IEqZj0WDYUnStq+FzdDcmTudxxdcmumJmBha4JP2ny34CxTBI6mBcyO61N85IapolcSP3A== X-Received: by 2002:a05:6e02:11a8:b0:348:ccd2:ce19 with SMTP id 8-20020a056e0211a800b00348ccd2ce19mr2961092ilj.29.1690303755383; Tue, 25 Jul 2023 09:49:15 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id m27-20020a02cddb000000b004231ee0fed4sm3596712jap.78.2023.07.25.09.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 09:49:14 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Add DAP support for C++ exceptions Date: Tue, 25 Jul 2023 10:49:08 -0600 Message-Id: <20230725164908.1295257-1-tromey@adacore.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This adds DAP support for the various C++ exception-catching operations. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30682 --- gdb/python/lib/gdb/dap/breakpoint.py | 21 +++++++-- gdb/testsuite/gdb.dap/cxx-exception.cc | 44 +++++++++++++++++++ gdb/testsuite/gdb.dap/cxx-exception.exp | 58 +++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.dap/cxx-exception.cc create mode 100644 gdb/testsuite/gdb.dap/cxx-exception.exp diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index 27745ebfd2c..5f928f4c0ef 100644 --- a/gdb/python/lib/gdb/dap/breakpoint.py +++ b/gdb/python/lib/gdb/dap/breakpoint.py @@ -295,10 +295,8 @@ def set_insn_breakpoints( @in_gdb_thread def _catch_exception(filterId, **args): - if filterId == "assert": - cmd = "-catch-assert" - elif filterId == "exception": - cmd = "-catch-exception" + if filterId in ("assert", "exception", "throw", "rethrow", "catch"): + cmd = "-catch-" + filterId else: raise Exception(f"Invalid exception filterID: {filterId}") result = gdb.execute_mi(cmd) @@ -346,6 +344,21 @@ def _rewrite_exception_breakpoint( "label": "Ada exceptions", "supportsCondition": True, }, + { + "filter": "throw", + "label": "C++ exceptions, when thrown", + "supportsCondition": True, + }, + { + "filter": "rethrow", + "label": "C++ exceptions, when re-thrown", + "supportsCondition": True, + }, + { + "filter": "catch", + "label": "C++ exceptions, when caught", + "supportsCondition": True, + }, ), ) def set_exception_breakpoints( diff --git a/gdb/testsuite/gdb.dap/cxx-exception.cc b/gdb/testsuite/gdb.dap/cxx-exception.cc new file mode 100644 index 00000000000..b6afb90d289 --- /dev/null +++ b/gdb/testsuite/gdb.dap/cxx-exception.cc @@ -0,0 +1,44 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +do_throw (int i) +{ + throw i; +} + +int +catcher (int x) +{ + return x; +} + +int main() +{ + try { + try { + do_throw (20); + } + catch (int x) { + catcher (x); + throw; + } + } + catch (int y) { + catcher (y); + } +} diff --git a/gdb/testsuite/gdb.dap/cxx-exception.exp b/gdb/testsuite/gdb.dap/cxx-exception.exp new file mode 100644 index 00000000000..46d4369a0f7 --- /dev/null +++ b/gdb/testsuite/gdb.dap/cxx-exception.exp @@ -0,0 +1,58 @@ +# Copyright 2023 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib ada.exp +load_lib dap-support.exp + +require allow_cplus_tests allow_dap_tests + +standard_testfile .cc + +if {[build_executable ${testfile}.exp $testfile $srcfile {debug c++}] == -1} { + return +} + +if {[dap_launch $testfile] == ""} { + return +} + +set obj [dap_check_request_and_response "set exception catchpoints" \ + setExceptionBreakpoints \ + {o filters [a [s throw] [s rethrow] [s catch]]}] + +set bps [dict get [lindex $obj 0] body breakpoints] +# We should get three responses, because we requested three +# breakpoints. +gdb_assert {[llength $bps] == 3} "three breakpoints" + +dap_check_request_and_response "start inferior" configurationDone + +dap_wait_for_event_and_check "stopped at throw" stopped \ + "body reason" breakpoint \ + "body hitBreakpointIds" 1 + +dap_check_request_and_response "continue to catch" continue \ + {o threadId [i 1]} +dap_wait_for_event_and_check "stopped at catch" stopped \ + "body reason" breakpoint \ + "body hitBreakpointIds" 3 + +dap_check_request_and_response "continue to rethrow" continue \ + {o threadId [i 1]} +dap_wait_for_event_and_check "stopped at rethrow" stopped \ + "body reason" breakpoint \ + "body hitBreakpointIds" 2 + +dap_shutdown -- 2.40.1