From patchwork Fri Jan 20 21:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63530 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 6609638983A0 for ; Fri, 20 Jan 2023 21:48:07 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 9AEE7385B521 for ; Fri, 20 Jan 2023 21:46:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9AEE7385B521 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 15CB010047409 for ; Fri, 20 Jan 2023 21:46:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IzDfpics5FqSRIzDfp2cEZ; Fri, 20 Jan 2023 21:46:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=c6Ru/Txl c=1 sm=1 tr=0 ts=63cb0bc3 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=TQBj472Df4Cp-_jPd6YA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=FJobpgYuLqwgz4fR/1lP+3UlVgcalbRpdVI4lVXrtUM=; b=QRhfGBUN3uIvV3cMsGVt4yRL8G ZGjpYjMQxywanHxhOV/UNIx9Sov18mT1pb2ATK2r7yAfiEozJh4bUezNbXsG1+qY4hXRHO1G0DW4B NOKYPWJIznTiFXpLIbiPjHKde; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60144 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pIzDe-001GNx-Q6; Fri, 20 Jan 2023 14:46:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 24/27] Have global_block inherit from block Date: Fri, 20 Jan 2023 14:46:15 -0700 Message-Id: <20230120214618.3236224-25-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120214618.3236224-1-tom@tromey.com> References: <20230120214618.3236224-1-tom@tromey.com> MIME-Version: 1.0 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: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pIzDe-001GNx-Q6 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60144 X-Source-Auth: tom+tromey.com X-Email-Count: 25 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.9 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" This changes global_block to inherit from block, which is what was always intended. --- gdb/block.c | 4 +--- gdb/block.h | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index 8f15cdf23f8..1698ee51e7b 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -397,9 +397,7 @@ allocate_block (struct obstack *obstack) struct block * allocate_global_block (struct obstack *obstack) { - struct global_block *bl = new (obstack) struct global_block; - - return &bl->block; + return new (obstack) struct global_block; } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index 9a60140581d..3d71e7daab1 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -314,12 +314,8 @@ struct block : public allocate_on_obstack /* The global block is singled out so that we can provide a back-link to the compunit symtab. */ -struct global_block : public allocate_on_obstack +struct global_block : public block { - /* The block. */ - - struct block block; - /* This holds a pointer to the compunit symtab holding this block. */ struct compunit_symtab *compunit_symtab = nullptr;