From patchwork Mon Mar 13 22:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66343 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 D426C383EC54 for ; Mon, 13 Mar 2023 22:10:03 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id A173C3858407 for ; Mon, 13 Mar 2023 22:08:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A173C3858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 081181004A412 for ; Mon, 13 Mar 2023 22:08:09 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id bqKupMgGwTdYmbqKupNc95; Mon, 13 Mar 2023 22:08:09 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=D8CCltdj c=1 sm=1 tr=0 ts=640f9ec9 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=k__wU0fu6RkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=pmTDNbZtAESQYN41jh4A:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=xcJnEjIi7CA/K3HwWMJ69/YDm7EcucczTLc4tCnH1L4=; b=Zjp+2ZT5U/KE8fpB6NYuRhERsN JvEUKUDnIvm59RJ3HJVKnBXQsHL6tlkbwbv3NG0oHEqbPhSzeKUo2xMs85o3/25h60u6eEKE5ai/z zE2/1f0W+jgrRNxmQ2oNhiyUb; Received: from 71-211-185-113.hlrn.qwest.net ([71.211.185.113]:52788 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pbqKu-000u2m-Ri for gdb-patches@sourceware.org; Mon, 13 Mar 2023 16:08:08 -0600 From: Tom Tromey Date: Mon, 13 Mar 2023 16:08:17 -0600 Subject: [PATCH 17/20] Use builtin type when appropriate MIME-Version: 1.0 Message-Id: <20230313-split-objfile-type-allocator-2-v1-17-69ba773ac17b@tromey.com> References: <20230313-split-objfile-type-allocator-2-v1-0-69ba773ac17b@tromey.com> In-Reply-To: <20230313-split-objfile-type-allocator-2-v1-0-69ba773ac17b@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.185.113 X-Source-L: No X-Exim-ID: 1pbqKu-000u2m-Ri X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-185-113.hlrn.qwest.net ([192.168.0.21]) [71.211.185.113]:52788 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" There are a few spots that check whether a type is objfile-owned, and then choose either the objfile- or arch-specific builtin type. I don't think there is a need to do this any more (if there ever was), because it is ok for an objfile-allocated type to refer to an arch-allocated type. --- gdb/compile/compile-c-types.c | 11 ++--------- gdb/compile/compile-cplus-types.c | 5 +---- gdb/gdbtypes.c | 5 +---- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 68903c27a97..f48eca2152a 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -164,10 +164,7 @@ convert_func (compile_c_instance *context, struct type *type) GDB's parser used to do. */ if (target_type == NULL) { - if (type->is_objfile_owned ()) - target_type = objfile_type (type->objfile_owner ())->builtin_int; - else - target_type = builtin_type (type->arch_owner ())->builtin_int; + target_type = builtin_type (type->arch ())->builtin_int; warning (_("function has unknown return type; assuming int")); } @@ -322,11 +319,7 @@ convert_type_basic (compile_c_instance *context, struct type *type) the cast-to type as the variable's type, like GDB's built-in parser does. For now, assume "int" like GDB's built-in parser used to do, but at least warn. */ - struct type *fallback; - if (type->is_objfile_owned ()) - fallback = objfile_type (type->objfile_owner ())->builtin_int; - else - fallback = builtin_type (type->arch_owner ())->builtin_int; + struct type *fallback = builtin_type (type->arch ())->builtin_int; warning (_("variable has unknown type; assuming int")); return convert_int (context, fallback); } diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index d48aa61b4bc..47cb26785fc 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -969,10 +969,7 @@ compile_cplus_convert_func (compile_cplus_instance *instance, GDB's parser used to do. */ if (target_type == nullptr) { - if (type->is_objfile_owned ()) - target_type = objfile_type (type->objfile_owner ())->builtin_int; - else - target_type = builtin_type (type->arch_owner ())->builtin_int; + target_type = builtin_type (type->arch ())->builtin_int; warning (_("function has unknown return type; assuming int")); } diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 8093a3911d7..a167308dc8f 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1408,10 +1408,7 @@ lookup_array_range_type (struct type *element_type, struct type *range_type; type_allocator alloc (element_type); - if (element_type->is_objfile_owned ()) - index_type = objfile_type (element_type->objfile_owner ())->builtin_int; - else - index_type = builtin_type (element_type->arch_owner ())->builtin_int; + index_type = builtin_type (element_type->arch ())->builtin_int; range_type = create_static_range_type (alloc, index_type, low_bound, high_bound);