From patchwork Wed Jan 11 18:42:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62961 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 28729385B51F for ; Wed, 11 Jan 2023 18:43:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28729385B51F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673462596; bh=nfVOnvk9Pb3ktd8RUn5H8OFQQGucouP+4/HB3+4ZGUY=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=FqU+cZGF+J7KuGRc/UQ6gkppPdXn8gty//+0QssI7xX9KYRYTU7AhmCoG3MeuVJGn pakCk9FHzvSkxsuqKFN43dj+tRGyol+5srTDwYnMGdEhckmM1d7aGg5dOqrIluoxqh mkeTax97NFC8jgcAkp91RICCRRfpTWMH2v1iJ6IA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-vs1-xe2b.google.com (mail-vs1-xe2b.google.com [IPv6:2607:f8b0:4864:20::e2b]) by sourceware.org (Postfix) with ESMTPS id 45FB33857C44 for ; Wed, 11 Jan 2023 18:42:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 45FB33857C44 Received: by mail-vs1-xe2b.google.com with SMTP id q125so4945572vsb.0 for ; Wed, 11 Jan 2023 10:42:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=nfVOnvk9Pb3ktd8RUn5H8OFQQGucouP+4/HB3+4ZGUY=; b=fDhvbhG7xnanmlPYiMGViNQ3ISiVG3kEYF6yNNBYi3q3Ug79r3zXSQa8m0AMahUkQ2 rKM/qS5GvHXqWb5odzeUwAWaAnGc3NQRxI6gA1fBsVtooUbj2EgX7SAF5GsWKR+kc5ko 27U+PoTWXg+pR/dMZTx6ZGebe6dZodFp6Na5A2eupXM1hrdXqw+dkRz7FT4gRU6u7+EA idwzNpdhgdrcIr0LROy+4zmZlEGk261VjJaVWu39C9SRinKxrO5IcOq4+JKbPEjjor+b 5VnifhKtacPepClcKWAMgsxADPh4RZVhRdGG/P8R/Dqyi7IsBlRXPxQmS8XFy1ekHlyW 8hew== X-Gm-Message-State: AFqh2kpxjebZAuaDPHkOlb7Fa/Rs4CSKTQYmkCrNQm6NTovYsj2Csgop NXVO9iHPEvGu655KNVG7GFxEmg3kSBAMW4Jt X-Google-Smtp-Source: AMrXdXtfSwC2nLK8cTwUrQ1h2pS170tQjiCSyhWoyp+98wPJ+f1NY3ufdBaEseEyH6gQVaABQzHvkg== X-Received: by 2002:a05:6102:7c8:b0:3d0:eb5b:e10b with SMTP id y8-20020a05610207c800b003d0eb5be10bmr1475975vsg.15.1673462569581; Wed, 11 Jan 2023 10:42:49 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id 195-20020a370ccc000000b007023fc46b64sm9343542qkm.113.2023.01.11.10.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 10:42:49 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Disable ptype/o for dynamic types Date: Wed, 11 Jan 2023 11:42:37 -0700 Message-Id: <20230111184237.2917382-1-tromey@adacore.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" A user pointed out that "ptype/o" of a certain Ada type -- while in C mode -- caused gdb to crash. The bug here is that dynamic types can't really be printed this way. This patch avoids the bug by disabling the "/o" feature in this case. Note that using "ptype/o" in this way makes sense for the time being, because the Ada code doesn't support the "/o" feature (yet); and in any case gdb should not crash. --- gdb/testsuite/gdb.ada/ptype-o.exp | 47 ++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/ptype-o/prog.adb | 29 ++++++++++++++++ gdb/typeprint.c | 6 ++++ 3 files changed, 82 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/ptype-o.exp create mode 100644 gdb/testsuite/gdb.ada/ptype-o/prog.adb diff --git a/gdb/testsuite/gdb.ada/ptype-o.exp b/gdb/testsuite/gdb.ada/ptype-o.exp new file mode 100644 index 00000000000..987c6e729b4 --- /dev/null +++ b/gdb/testsuite/gdb.ada/ptype-o.exp @@ -0,0 +1,47 @@ +# 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 . + +# Test that ptype/o of a dynamic type does not crash. + +load_lib "ada.exp" + +if { [skip_ada_tests] } { return -1 } + +standard_ada_testfile prog + +foreach_with_prefix scenario {all minimal} { + set flags [list debug additional_flags=-fgnat-encodings=$scenario] + + if {[gdb_compile_ada "${srcfile}" "${binfile}-${scenario}" executable $flags] != ""} { + return -1 + } + + clean_restart ${testfile}-${scenario} + + set bp_location [gdb_get_line_number "BREAK" ${testdir}/prog.adb] + runto "prog.adb:$bp_location" + + gdb_test "set lang c" \ + "Warning: the current language does not match this frame." + + if {$scenario == "minimal"} { + set exp "ptype/o does not work with dynamic types.*" + } else { + # In "all" mode this prints nonsense, but at least does not + # crash. + set exp ".*" + } + gdb_test "ptype/o struct prog__rec" $exp +} diff --git a/gdb/testsuite/gdb.ada/ptype-o/prog.adb b/gdb/testsuite/gdb.ada/ptype-o/prog.adb new file mode 100644 index 00000000000..1a3caad612e --- /dev/null +++ b/gdb/testsuite/gdb.ada/ptype-o/prog.adb @@ -0,0 +1,29 @@ +-- 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 . + +procedure Prog is + type Index is range 0 .. 31; + type Char_Array is array ( Index range <>) of Character; + + type Rec (Length : Index) is + record + TV_Description : Char_Array (1 .. Length); + Note : Char_Array (1 .. Length); + end record; + + X : Rec (7); +begin + null; -- BREAK +end Prog; diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 87df7f2ad35..41b57353ce1 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -539,6 +539,12 @@ whatis_exp (const char *exp, int show) type = value_type (val); } + if (flags.print_offsets && is_dynamic_type (type)) + { + warning (_("ptype/o does not work with dynamic types; disabling '/o'")); + flags.print_offsets = 0; + } + get_user_print_options (&opts); if (val != NULL && opts.objectprint) {