From patchwork Fri Oct 27 17:36:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78628 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 303723861927 for ; Fri, 27 Oct 2023 17:37:50 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id 5A4E53861808 for ; Fri, 27 Oct 2023 17:36:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A4E53861808 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 5A4E53861808 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::133 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698428217; cv=none; b=f9r0UL7+dhWg7K8CIs2BcK6bNmmzBda291InAouyAJpaVkJPs9ytjzy/9J1MFk838xxvLBIeTmISPefrpPBXju4qfZm9tUc6kfok7ZijiEoVmVQSqYd6A7QETTgBYWjnoPrPhcMhzjt6/Pq6IUBcMumAn1cBbPNxmpBP3EbFi4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698428217; c=relaxed/simple; bh=39EjaVCT7O4dlOacndIDldpYrEmkw0TeuJuLNZGlT70=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=G/0g7MUxm+nO/3GOqpr2y54XrL6XCKCjm3ErmxwwV/DyD4td6RVzuGobpm3GHgwtfJs3BgwnzM0QmOiqL1sabzybKKH3Mg3CSmuNa2AsGm16H8G7tS2kux3yhHihsmlS5UbdFpEsg/Jkav6ez+j3ro9JEsa7rYfj3n5iunpn2qY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-3573e6dd79bso6864025ab.2 for ; Fri, 27 Oct 2023 10:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1698428215; x=1699033015; 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=3m/ZAMouO76b5meov8Elh8CkF7vw4/KJFJXc/tWCqNY=; b=PI0e47lWESwdKxJbkmP/zoxQx4IdCI8X1PrptFW5oSYdh3MZmNU0UaKvGzgmFT0apt Hy65b1xr23+xNGPIf1fgwjwuylqkUMfFwGlvYitrs9eLFChLmjeOp1MQxsK5zBu3BYXJ J2WqlpeKv2vh9dIDnFI6JIIjsT1u/n0mPtOhNYG98sW2ftmHa5L2peNbiDc+vVlANK7x 1AfSptI/ErrFWfDLYNGxvi/zX/vAJIeHKyfN8+z7siYUzM2/1GOMYIPVz79jSJeGeQxH mZ+vrOoLzP8Hc+Fn3v7gnTSeO61mUSc8elda/Zh1aX1sxfYZY1IK0JlSl6eClKdLoWHw Y9gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698428215; x=1699033015; 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=3m/ZAMouO76b5meov8Elh8CkF7vw4/KJFJXc/tWCqNY=; b=Q7kOB695fGIf92ZMNBLRN3asVa507pOxeroMLuJAcxLCLWfk/TWyGO0hsxL0DHpKQM Sq5h/pVk3X5QeWRdJbHVCJUJ7a2Hhqbdx8/ZbeGwsXpjKWEo44RwFgr6Q1qzyGxBJsWG LcCdooOsCubQnyREzDvduVjifoZRYYspslXkkk3zjho4VYQBvd64kNiBfg4JbbAhRgg2 13//mTxFtpytW6StJ8MmSVr2HcCG62pO8wzBbnpfEADr6A7th6vM6Fuc/JsyXVtZVBrY Jf1TxbK2KnLYRc4e6FKZYHTTK/8YiSrhCoVlvmk21iXhr4v2OWqQru9Usl7bE/yASuyG aluQ== X-Gm-Message-State: AOJu0Yy/C+Ohq8hDfdLDLB/O5GJpQM0tg50l8JKh0FHL6KBIoIBY/Ovp IzlR6+XnRcoME4AStrbP34/sqkWdmbUKv4QMV1bhAw== X-Google-Smtp-Source: AGHT+IGk5rhyEfmj4oRctP5KyVPKZjRaUc62fsxZ4AzOsJqhsRacNmPusfI4Dpc7t05XdbOCZ8oX1Q== X-Received: by 2002:a05:6e02:20c6:b0:357:6170:90f3 with SMTP id 6-20020a056e0220c600b00357617090f3mr3691835ilq.30.1698428215478; Fri, 27 Oct 2023 10:36:55 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 10:36:54 -0700 (PDT) From: Tom Tromey Date: Fri, 27 Oct 2023 11:36:48 -0600 Subject: [PATCH v2 8/9] Use enum accessibility in types and member functions MIME-Version: 1.0 Message-Id: <20231027-field-bits-v2-8-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.5 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 nested types and member functions to use the new 'accessibility' enum, rather than separate private/protected flags. This is done for consistency, but it also lets us simplify some other code in the next patch. --- gdb/dwarf2/read.c | 8 ++++---- gdb/gdbtypes.h | 27 ++++++++++++++------------- gdb/stabsread.c | 4 ++-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 22aaec30ff1..15acec68788 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -11855,10 +11855,10 @@ dwarf2_add_type_defn (struct field_info *fip, struct die_info *die, /* The assumed value if neither private nor protected. */ break; case DW_ACCESS_private: - fp.is_private = 1; + fp.accessibility = accessibility::PRIVATE; break; case DW_ACCESS_protected: - fp.is_protected = 1; + fp.accessibility = accessibility::PROTECTED; break; } @@ -12217,10 +12217,10 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die, switch (accessibility) { case DW_ACCESS_private: - fnp->is_private = 1; + fnp->accessibility = accessibility::PRIVATE; break; case DW_ACCESS_protected: - fnp->is_protected = 1; + fnp->accessibility = accessibility::PROTECTED; break; } diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index cfa378f77a1..3c7c420f501 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1611,8 +1611,8 @@ struct fn_field unsigned int is_const:1; unsigned int is_volatile:1; - unsigned int is_private:1; - unsigned int is_protected:1; + /* Accessibility of the field. */ + ENUM_BITFIELD (accessibility) accessibility : 2; unsigned int is_artificial:1; /* * A stub method only has some fields valid (but they are enough @@ -1657,11 +1657,8 @@ struct decl_field struct type *type; - /* * True if this field was declared protected, false otherwise. */ - unsigned int is_protected : 1; - - /* * True if this field was declared private, false otherwise. */ - unsigned int is_private : 1; + /* Accessibility of the field. */ + ENUM_BITFIELD (accessibility) accessibility : 2; }; /* * C++ language-specific information for TYPE_CODE_STRUCT and @@ -1984,8 +1981,10 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_FN_FIELD_ARGS(thisfn, n) (((thisfn)[n].type)->fields ()) #define TYPE_FN_FIELD_CONST(thisfn, n) ((thisfn)[n].is_const) #define TYPE_FN_FIELD_VOLATILE(thisfn, n) ((thisfn)[n].is_volatile) -#define TYPE_FN_FIELD_PRIVATE(thisfn, n) ((thisfn)[n].is_private) -#define TYPE_FN_FIELD_PROTECTED(thisfn, n) ((thisfn)[n].is_protected) +#define TYPE_FN_FIELD_PRIVATE(thisfn, n) \ + ((thisfn)[n].accessibility == accessibility::PRIVATE) +#define TYPE_FN_FIELD_PROTECTED(thisfn, n) \ + ((thisfn)[n].accessibility == accessibility::PROTECTED) #define TYPE_FN_FIELD_ARTIFICIAL(thisfn, n) ((thisfn)[n].is_artificial) #define TYPE_FN_FIELD_STUB(thisfn, n) ((thisfn)[n].is_stub) #define TYPE_FN_FIELD_CONSTRUCTOR(thisfn, n) ((thisfn)[n].is_constructor) @@ -2008,9 +2007,9 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_TYPEDEF_FIELD_COUNT(thistype) \ TYPE_CPLUS_SPECIFIC (thistype)->typedef_field_count #define TYPE_TYPEDEF_FIELD_PROTECTED(thistype, n) \ - TYPE_TYPEDEF_FIELD (thistype, n).is_protected + (TYPE_TYPEDEF_FIELD (thistype, n).accessibility == accessibility::PROTECTED) #define TYPE_TYPEDEF_FIELD_PRIVATE(thistype, n) \ - TYPE_TYPEDEF_FIELD (thistype, n).is_private + (TYPE_TYPEDEF_FIELD (thistype, n).accessibility == accessibility::PRIVATE) #define TYPE_NESTED_TYPES_ARRAY(thistype) \ TYPE_CPLUS_SPECIFIC (thistype)->nested_types @@ -2023,9 +2022,11 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_NESTED_TYPES_COUNT(thistype) \ TYPE_CPLUS_SPECIFIC (thistype)->nested_types_count #define TYPE_NESTED_TYPES_FIELD_PROTECTED(thistype, n) \ - TYPE_NESTED_TYPES_FIELD (thistype, n).is_protected + (TYPE_NESTED_TYPES_FIELD (thistype, n).accessibility \ + == accessibility::PROTECTED) #define TYPE_NESTED_TYPES_FIELD_PRIVATE(thistype, n) \ - TYPE_NESTED_TYPES_FIELD (thistype, n).is_private + (TYPE_NESTED_TYPES_FIELD (thistype, n).accessibility \ + == accessibility::PRIVATE) #define TYPE_IS_OPAQUE(thistype) \ ((((thistype)->code () == TYPE_CODE_STRUCT) \ diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 334371c2e46..fbf11701337 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -2372,10 +2372,10 @@ read_member_functions (struct stab_field_info *fip, const char **pp, switch (*(*pp)++) { case VISIBILITY_PRIVATE: - new_sublist->fn_field.is_private = 1; + new_sublist->fn_field.accessibility = accessibility::PRIVATE; break; case VISIBILITY_PROTECTED: - new_sublist->fn_field.is_protected = 1; + new_sublist->fn_field.accessibility = accessibility::PROTECTED; break; }