From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id 0F0913858C74 for ; Thu, 21 Sep 2023 18:01:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F0913858C74 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-io1-xd2a.google.com with SMTP id ca18e2360f4ac-792707f78b5so49132539f.1 for ; Thu, 21 Sep 2023 11:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1695319290; x=1695924090; 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=hsAQketeGlgf9WMJuIge8BwJQ1UV0pyN+DdFw7n/n/M=; b=jhCrBbiLqR2hCRracMkvE41Nb4UfeQysgMVKVPmxr11D47Arm3ilBVI1g09NMsMK+8 l8soYeAiFW2qnI+9WA/kCUSvvb0gJwolr6B/7xi1FL0RBjSGpTOU/Jm+bUhDJTqSZ6ls Xx3qKIZ8UXauBMjU52OxWd81FXPRM+2zpPte+xA+beNPBG1nK8ZZ5WocgYOKlEszfxiP CjuKmuzI105M6E5woM0+j4009GJSy76iBUQf7BL469o/3dYdpSzr1+WSXJKTiNksw0x/ 7d/CWBs8EkWMbykojWrP30lOWaU7FQZdJmZYpGdwr0ITiujERBvmDSMheyYDawI7ZDjn K7bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695319290; x=1695924090; 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=hsAQketeGlgf9WMJuIge8BwJQ1UV0pyN+DdFw7n/n/M=; b=MTwViWxQmijp7PacdSFJNSxVzUZQA/RX9KduQ9vGw6UuuEbWN9q2zSKG0zfAk9KZjU MAquOi0IHckQk4gNEm7t8ElA9FI5cMu6UoJCE559dzoMLOeM+Si/aJkJbIj16MhK0Jrj fXt6ChuZNRNluFM8mxqJ38dNIqd5iLHYI66ca6M3WG2xW1b3VYT2eo2dNVPz22Do7gb9 UU3htDjjo9JfWYlkQxYjZO5sBhfrnJ8ttSB6eDYRfeCcjESmwoSFBx+IZI3tbYjRkgD0 8I4cTkRuViB3NjEaIR+iPdD0N2JY6Rp9pt+/tt8VVgDujeXZbBR5c/xmriAJwEOm1Xin gaJQ== X-Gm-Message-State: AOJu0YxQIOGA+fw1/f/Q3o44GCRJ/NmRAw6GTEuMFq+512W5mYTM7juS r1Y7TWmfxPeXMn4R5QssGpp6VMw3yOWBa6F83y6DHw== X-Google-Smtp-Source: AGHT+IGbCc6Mth9oFSgY+KExNVctVBttoR5PzBmqH58HCr+bFDb/KTNuTZVYFfdVSkr+pK6xRpM+LA== X-Received: by 2002:a5e:8819:0:b0:799:2163:418a with SMTP id l25-20020a5e8819000000b007992163418amr7396692ioj.13.1695319290334; Thu, 21 Sep 2023 11:01:30 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id q6-20020a02a306000000b0042b52dc77e3sm483736jai.158.2023.09.21.11.01.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 11:01:30 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Sep 2023 12:01:29 -0600 Subject: [PATCH 2/7] Print field accessibility inline MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230921-field-bits-v1-2-201285360900@adacore.com> References: <20230921-field-bits-v1-0-201285360900@adacore.com> In-Reply-To: <20230921-field-bits-v1-0-201285360900@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 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,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 List-Id: 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 18aa8e5c29e..1aabb38fa5f 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5289,12 +5289,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); -- 2.40.1