From patchwork Fri Oct 27 17:36:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78621 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 84CF1386182A for ; Fri, 27 Oct 2023 17:37:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id D6FC5385E019 for ; Fri, 27 Oct 2023 17:36:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6FC5385E019 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D6FC5385E019 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d29 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698428213; cv=none; b=EdATjxGjSa6qCp/If5h6ZZEBusGfsXQaBNUxc3Tuzu1Uy2ISU3+eevRHRjFDafCIcwTh2zJYAuVaRXizQS+YI1+HLOslJzxDSNkLKmASqvOZfBynS6Px1/H9JLwJBlg/GhsNXRGbj/kSpNmybIZswDkdTzcltaN1EL/aWsSl/kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698428213; c=relaxed/simple; bh=rX9ljhnHq2dmL45eW24WCW9v1J4SWo2L9e01aWe9Bp0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=pxM3wOxEpP7dFdm9rjEH1ujV5mLvOe2J1Er5qNbKhsoPaNGwFBaXFA5d4s7KpCCQnXZiH1IMrLj9+7flW6bNP+X1q1XSaOmPwHKb1jHC8XUBK/DRjifB+tL7suqoy9EroO2WPRwf08bvrYB80vBX+nj31AKzwho6Zqd6tgA/P+Y= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7a94a3b0a49so64408039f.2 for ; Fri, 27 Oct 2023 10:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1698428211; x=1699033011; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EWYT9QTCkMGkljxhVYHxM8htM4jZ6ngfvbtAkbw9R2s=; b=Mw2p7joUcxpd0mT8v8rsOSkOf5k7zYj1oJHqr8Hfh2GP8XKrb8BnBLgO4DpvaxGOMA t9m6lXrspmuqFDTH4lCMS0Fp8hkcmlgn45hRtFOwGaF3WcDW8vQYIlVS1902niAtSTs4 Zbgvz1qor6/lzYxUHPyCh6moAd9Wzq6BQ23quNSZhXeKXu6LquOpzXRcEeyf472PJfAn zug2LUeSBwdx57COlYcwzxXIkL5FY7VuKpAB1xa1POSQKeCzKK0YqLRwQeVvhLfMG0if h9RtXd+ZvrONxdD/MP1rt19Sut1JPnreuFXy/0v5FgqagOQpuFPKEZqjD0pFBiy1fuOu rD6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698428211; x=1699033011; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EWYT9QTCkMGkljxhVYHxM8htM4jZ6ngfvbtAkbw9R2s=; b=dXJ8QBlRKXmG2vzxMelPtxbm1UBnARgg3trOJf8fBRL0NYT9qj0sPYo3Z5dnnpDPD2 JFD9nxSYLidxQvcjIJLS9u0oTHDRVt/AW/04FumbfsaT0lyYKnYgtkgyOva98OKMSRHZ /wXksMEbT3LMRxJZDVm6+E3CV519N4VDgwek9gIglGlC2ZZ8eiL6mPM6sZzsxlPxwxgs H0k1WuY7VofZs3yNUUAAdtNsGgcp1rqmk76ixmjpXNMtBmJD/CXVYrXx7UNxvDZNPXEG cG9C8Rnu3nRGKTemh/ckuNxKBfQeTptiM2xIjy4eW6tawyGkRQFP08lD2sh8YoXHK3vZ Scxg== X-Gm-Message-State: AOJu0YwKmAQwtxn/fRqtaK+KL2379xGzInxILWuqNRC+COUxBrPAZDNo broBKrQpWZkKvHwND3xaxRo+/rgo16GI63hjdXslzQ== X-Google-Smtp-Source: AGHT+IEfafMZCRrlhYN+tpkNrN00fEXBjgcHztCD822TQfLjequ0RWrrqsrQbnPK9qfjUU95cTHt3A== X-Received: by 2002:a05:6e02:2196:b0:352:6f88:9818 with SMTP id j22-20020a056e02219600b003526f889818mr4119115ila.11.1698428210984; Fri, 27 Oct 2023 10:36:50 -0700 (PDT) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id r4-20020a92ce84000000b00357ce043118sm591754ilo.79.2023.10.27.10.36.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 10:36:50 -0700 (PDT) From: Tom Tromey Date: Fri, 27 Oct 2023 11:36:42 -0600 Subject: [PATCH v2 2/9] Print field accessibility inline MIME-Version: 1.0 Message-Id: <20231027-field-bits-v2-2-cbec64f2136a@adacore.com> References: <20231027-field-bits-v2-0-cbec64f2136a@adacore.com> In-Reply-To: <20231027-field-bits-v2-0-cbec64f2136a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This changes recursive_dump_type to print field accessibility information "inline". This is clearer and preserves the information when the byte vectors are removed. --- gdb/gdbtypes.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 1de90eff7ee..203728a61d8 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5288,12 +5288,21 @@ recursive_dump_type (struct type *type, int spaces) gdb_printf ("%*s[%d] bitpos %s bitsize %d type ", spaces + 2, "", idx, plongest (type->field (idx).loc_bitpos ()), type->field (idx).bitsize ()); - gdb_printf ("%s name '%s' (%s)\n", + gdb_printf ("%s name '%s' (%s)", host_address_to_string (type->field (idx).type ()), type->field (idx).name () != NULL ? type->field (idx).name () : "", host_address_to_string (type->field (idx).name ())); + if (TYPE_FIELD_VIRTUAL (type, idx)) + gdb_printf (" virtual"); + if (TYPE_FIELD_PRIVATE (type, idx)) + gdb_printf (" private"); + else if (TYPE_FIELD_PROTECTED (type, idx)) + gdb_printf (" protected"); + else if (TYPE_FIELD_IGNORE (type, idx)) + gdb_printf (" ignored"); + gdb_printf ("\n"); if (type->field (idx).type () != NULL) { recursive_dump_type (type->field (idx).type (), spaces + 4);