From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GeD8I1NYsWmamSMAWB0awg (envelope-from ) for ; Wed, 11 Mar 2026 07:56:03 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b+WhIm0Z; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FHiqPEVG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b+WhIm0Z; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FHiqPEVG; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 8D9201E0DD; Wed, 11 Mar 2026 07:56:03 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id D49621E08D for ; Wed, 11 Mar 2026 07:56:02 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 59F384BB3B98 for ; Wed, 11 Mar 2026 11:56:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59F384BB3B98 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b+WhIm0Z; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FHiqPEVG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b+WhIm0Z; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FHiqPEVG Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 2C0264BB3BF4 for ; Wed, 11 Mar 2026 11:55:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C0264BB3BF4 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2C0264BB3BF4 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773230114; cv=none; b=UPG+cAX7z4Uhco4LVkt/DxM3p9BTRTIp+GBZkerp8UI5nmPqW5XV2zItnjwCaVen7wPk2RqxWVyMcAjF7SXPC/J+d1UCwvd+aMCLTzuE1GMNE7hqkhTG21FjzRkETj1FQFO6HHAoFNhL+DBFZQCdDviGoVYPjYxDapE91C9TbcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773230114; c=relaxed/simple; bh=8LLb0SkC7srD/RJl2IMlPQwN+/40rlHRyUrZ1B5GN6E=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=syrJq+4CzFZBW/pUea0Czumm5FQif+oRyADJSmgpB06yopHva4xmb1pHoa+ALXkuoYLMmjkKVemrgAEbrXdbRsOiRg1Ph2Ke2XTDi5TGcLak148g7eaA5H4lk00jfIZZo4yjAzcW+/r04iEwK88k/ZZ1pvlCwFDAKWY8fgR4yqg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C0264BB3BF4 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 88FB45BEAF for ; Wed, 11 Mar 2026 11:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773230107; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=omXHIJSLfmw9HJNxIUyteRAhVWJUHKvAA+Uem6S8uqs=; b=b+WhIm0Z6q2sJ9T83Km2rycYw784z+XGtt12kRi9kpnGaGR12BOHcDLXQHXHQvfbOm50ou bm/S4JvsJx++QeD10N0Xw1t5cvUHATv0coSv7UgmZUlViZLoQTiEUfhf2yeIijIRBJGv/L 9ujUatOlmnuiFKJPJdWYSGV/I5hh1Zk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773230107; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=omXHIJSLfmw9HJNxIUyteRAhVWJUHKvAA+Uem6S8uqs=; b=FHiqPEVGPxYP+ixwT18WpMDmUb+Pu+VFsMNnP3RrxPyLEVhlNiZNnVqjy69JQhzaM61B6Z 4P2+suRhMYDS+oDw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=b+WhIm0Z; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=FHiqPEVG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773230107; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=omXHIJSLfmw9HJNxIUyteRAhVWJUHKvAA+Uem6S8uqs=; b=b+WhIm0Z6q2sJ9T83Km2rycYw784z+XGtt12kRi9kpnGaGR12BOHcDLXQHXHQvfbOm50ou bm/S4JvsJx++QeD10N0Xw1t5cvUHATv0coSv7UgmZUlViZLoQTiEUfhf2yeIijIRBJGv/L 9ujUatOlmnuiFKJPJdWYSGV/I5hh1Zk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773230107; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=omXHIJSLfmw9HJNxIUyteRAhVWJUHKvAA+Uem6S8uqs=; b=FHiqPEVGPxYP+ixwT18WpMDmUb+Pu+VFsMNnP3RrxPyLEVhlNiZNnVqjy69JQhzaM61B6Z 4P2+suRhMYDS+oDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B575A3F9DC for ; Wed, 11 Mar 2026 11:55:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gM5jKhpYsWn/cgAAD6G6ig (envelope-from ) for ; Wed, 11 Mar 2026 11:55:06 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/2] [gdb] Factor out is_dynamic_type_internal_1 Date: Wed, 11 Mar 2026 12:55:05 +0100 Message-ID: <20260311115506.3101288-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260311115506.3101288-1-tdevries@suse.de> References: <20260311115506.3101288-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 88FB45BEAF 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~public-inbox=simark.ca@sourceware.org Simplify is_dynamic_type_internal by factoring out is_dynamic_type_internal_1, leaving only the handling of the top_level parameter in is_dynamic_type_internal. --- gdb/gdbtypes.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index f3422fe5609..00ef8122978 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1913,15 +1913,10 @@ array_type_has_dynamic_stride (struct type *type) /* Worker for is_dynamic_type. */ static bool -is_dynamic_type_internal (struct type *type, bool top_level) +is_dynamic_type_internal_1 (struct type *type) { type = check_typedef (type); - /* We only want to recognize references and pointers at the outermost - level. */ - if (top_level && type->is_pointer_or_reference ()) - type = check_typedef (type->target_type ()); - /* Types that have a dynamic TYPE_DATA_LOCATION are considered dynamic, even if the type itself is statically defined. From a user's point of view, this may appear counter-intuitive; @@ -1957,7 +1952,7 @@ is_dynamic_type_internal (struct type *type, bool top_level) of the range type are static. It allows us to assume that the subtype of a static range type is also static. */ return (!has_static_range (type->bounds ()) - || is_dynamic_type_internal (type->target_type (), false)); + || is_dynamic_type_internal_1 (type->target_type ())); } case TYPE_CODE_STRING: @@ -1968,10 +1963,10 @@ is_dynamic_type_internal (struct type *type, bool top_level) gdb_assert (type->num_fields () == 1); /* The array is dynamic if either the bounds are dynamic... */ - if (is_dynamic_type_internal (type->index_type (), false)) + if (is_dynamic_type_internal_1 (type->index_type ())) return true; /* ... or the elements it contains have a dynamic contents... */ - if (is_dynamic_type_internal (type->target_type (), false)) + if (is_dynamic_type_internal_1 (type->target_type ())) return true; /* ... or if it has a dynamic stride... */ if (array_type_has_dynamic_stride (type)) @@ -1992,7 +1987,7 @@ is_dynamic_type_internal (struct type *type, bool top_level) if (f.is_static ()) continue; /* If the field has dynamic type, then so does TYPE. */ - if (is_dynamic_type_internal (f.type (), false)) + if (is_dynamic_type_internal_1 (f.type ())) return true; /* If the field is at a fixed offset, then it is not dynamic. */ @@ -2012,6 +2007,22 @@ is_dynamic_type_internal (struct type *type, bool top_level) return false; } +/* Worker for is_dynamic_type. If TOP_LEVEL and TYPE is a pointer or a + reference to a dynamic type, it is also considered a dynamic type. */ + +static bool +is_dynamic_type_internal (struct type *type, bool top_level) +{ + type = check_typedef (type); + + /* We only want to recognize references and pointers at the outermost + level. */ + if (top_level && type->is_pointer_or_reference ()) + type = check_typedef (type->target_type ()); + + return is_dynamic_type_internal_1 (type); +} + /* See gdbtypes.h. */ bool -- 2.51.0