From patchwork Fri Nov 3 16:09:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79027 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 7B009386C5AC for ; Fri, 3 Nov 2023 16:10:01 +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 EA6EC3858D39 for ; Fri, 3 Nov 2023 16:09:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EA6EC3858D39 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 EA6EC3858D39 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=1699027779; cv=none; b=RfnlgbVkep4spN8vSUbO0Qd6Y3wLlZOFZW9Ew0zoS30vwIGurkNFdcb6oiAJgQWWCyTuwJgSOBUB+DyhZPqxC5LyhSMo4DGCBi6Agq8jxKgWwCi+tw+da7bnhpqU/Nn8irNBkBa0iVB/Q99nsHcw90SwzkETVOPx/GFkVqPnWHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699027779; c=relaxed/simple; bh=B4wYsOB9JalS4o8i4vJMOKC5YeOR4j3+GTclxzm5hxI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=O4r/7C1pAGYC6nLbXrvJ5cuZR4d5Dkkpabdh+3/fHXE1lD73XWG+5QMfBVp/t0QL4FC8GAq1EHLOg9oKPXgNqhd9wJHw9Rb6+Y1vNRqcrru+spat7Ghxa9qwMWmZi6DSRO8n+oxHNMsMr/NJNhuTpadJAVuLVLon/RQgh89XlB4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7a67b9cd230so80599839f.1 for ; Fri, 03 Nov 2023 09:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1699027769; x=1699632569; darn=sourceware.org; h=cc: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=h7ikK2xePwmWiSr6gicmXGwXrIHvClDbBZfna8fiMLI=; b=QnrJpus09Fnrfrhr2sR9UICvMPYUs4h7yAckJ2IgodbRDjPS0uDo10y9MTdjRy2WLp sErSlrK1Sy/YsPrc6RxQBgZqqdRh8LRO9HkcxYjPC98nFB0i+b7tmrG8E0+SCPivW9kA eFOYy0a+MmQ1HIlMB/gMxiBmiSJdqFZ49NwZjyZ0xTUd0zdmYC8TLCHfvgKPdj+yvbnS htEKGgnPpQyJXv6O3bmUsyx93TTgn5C9ZOO3mpRFehqAA993NiQR5xdxF92vaXTd6Paf cTC81rQ/2AYJ6Adyx8tpoKS9Rt2enGQ58jLoMJvCArUk4/IpoKOxKxwJlntqbnpuWr4L aUZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699027769; x=1699632569; h=cc: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=h7ikK2xePwmWiSr6gicmXGwXrIHvClDbBZfna8fiMLI=; b=CNvoVEb+GlT/Hgo46I0tt5Y72Gl+DrxB/XPvmjvNWf4lukBh1MyN0OI0cIEtzxHaEv exKKi+TNFEPIG4hqHN3sJTO7RR4BCQVU2eaAxF+xdZHnuv2+9/K+Iqk8owiEaEyntwIM h154A/wk0KCcG4PQzKDK29sDEVkrqsKV+t3s0deWbQlhnAbLVeWv2x76rQMfBwuP7AxF 9tyd9KC7U6gBodelVTXhLe+T2HWm6xXkG1xRUATeQc7BLicbU0lWHEttJYEroxB61lvA jSyIXBNHFlZ4dzbLfZt2vjKudQUEBWY8XQj40UQ+kEx4vXAl3SFUKmlPWcgXI1TzTjJo pwlA== X-Gm-Message-State: AOJu0YyCNw44GEhf/EsSJ/wP4oYiSkpu0uZANbLkKVIq+24cHa9tCbxU bsK41rDokMiv5dn4IsnIbqtcqw== X-Google-Smtp-Source: AGHT+IEDtJHbC4y7HnghhHlCwOVlZpTgn/DaNqwDHslbsvYrryT7UcbkCtfrrK6OkyGW6DRSulEt7A== X-Received: by 2002:a05:6602:13d5:b0:7a6:889e:c4b7 with SMTP id o21-20020a05660213d500b007a6889ec4b7mr31823157iov.11.1699027769159; Fri, 03 Nov 2023 09:09:29 -0700 (PDT) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id gu16-20020a0566382e1000b0042b3dcb1106sm581839jab.47.2023.11.03.09.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 09:09:28 -0700 (PDT) From: Tom Tromey Date: Fri, 03 Nov 2023 10:09:24 -0600 Subject: [PATCH v3 2/9] Print field accessibility inline MIME-Version: 1.0 Message-Id: <20231103-field-bits-v3-2-273c40bcaf3d@adacore.com> References: <20231103-field-bits-v3-0-273c40bcaf3d@adacore.com> In-Reply-To: <20231103-field-bits-v3-0-273c40bcaf3d@adacore.com> To: gdb-patches@sourceware.org Cc: Simon Marchi , Keith Seitz X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.8 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, 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 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. Acked-By: Simon Marchi Reviewed-by: Keith Seitz --- gdb/gdbtypes.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index a585674ebe4..2cd74a2fb29 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5289,12 +5289,23 @@ 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);