From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id DC21D385B524 for ; Fri, 20 Jan 2023 21:46:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC21D385B524 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 cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 5BE4B100476C6 for ; Fri, 20 Jan 2023 21:46:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IzDfpwStvbwScIzDfpCg54; Fri, 20 Jan 2023 21:46:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=X8KXlEfe 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=uTLsh3KIjzS3uoR6qUoA: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=leaGDhUkOo2sQPgUhXT2sgoYms5Td5EominPMtj2Tbw=; b=DCZS0mPpfYJGVS0+z9qT+jo5xm GW2OwQeOvKosLIOgrSzrdHx/Wh40pqpSN+xSbHQxzYp9ArTRZUO30nqxgHgRgP2bKENgNVHGUKTkZ UXj9xsV6vcHRkmqqw+F0BmO+9; 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 1pIzDf-001GNx-3d; Fri, 20 Jan 2023 14:46:43 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 25/27] Remove allocate_block and allocate_global_block Date: Fri, 20 Jan 2023 14:46:16 -0700 Message-Id: <20230120214618.3236224-26-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 Content-Transfer-Encoding: 8bit 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: 1pIzDf-001GNx-3d 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: 26 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 List-Id: This removes allocate_block and allocate_global_block in favor of simply calling 'new'. --- gdb/block.c | 23 ----------------------- gdb/block.h | 4 ---- gdb/buildsym.c | 7 ++++--- gdb/jit.c | 9 +++++---- gdb/mdebugread.c | 2 +- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index 1698ee51e7b..334d8180448 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -377,29 +377,6 @@ block::global_block () const return block; } -/* Allocate a block on OBSTACK, and initialize its elements to - zero/NULL. This is useful for creating "dummy" blocks that don't - correspond to actual source files. - - Warning: it sets the block's BLOCK_MULTIDICT to NULL, which isn't a - valid value. If you really don't want the block to have a - dictionary, then you should subsequently set its BLOCK_MULTIDICT to - dict_create_linear (obstack, NULL). */ - -struct block * -allocate_block (struct obstack *obstack) -{ - return new (obstack) struct block; -} - -/* Allocate a global block. */ - -struct block * -allocate_global_block (struct obstack *obstack) -{ - return new (obstack) struct global_block; -} - /* See block.h. */ void diff --git a/gdb/block.h b/gdb/block.h index 3d71e7daab1..7c40bae9af2 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -426,10 +426,6 @@ extern const struct block *block_for_pc (CORE_ADDR); extern const struct block *block_for_pc_sect (CORE_ADDR, struct obj_section *); -extern struct block *allocate_block (struct obstack *obstack); - -extern struct block *allocate_global_block (struct obstack *obstack); - /* A block iterator. This structure should be treated as though it were opaque; it is only defined here because we want to support stack allocation of iterators. */ diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 9d45938f8e9..303eed52282 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -211,9 +211,10 @@ buildsym_compunit::finish_block_internal struct pending_block *pblock; struct pending_block *opblock; - block = (is_global - ? allocate_global_block (&m_objfile->objfile_obstack) - : allocate_block (&m_objfile->objfile_obstack)); + if (is_global) + block = new (&m_objfile->objfile_obstack) global_block; + else + block = new (&m_objfile->objfile_obstack) struct block; if (symbol) { diff --git a/gdb/jit.c b/gdb/jit.c index f584438c229..0b089bc6a82 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -567,7 +567,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) int block_idx = FIRST_LOCAL_BLOCK; for (gdb_block &gdb_block_iter : stab->blocks) { - struct block *new_block = allocate_block (&objfile->objfile_obstack); + struct block *new_block = new (&objfile->objfile_obstack) block; struct symbol *block_name = new (&objfile->objfile_obstack) symbol; struct type *block_type = arch_type (objfile->arch (), TYPE_CODE_VOID, @@ -609,9 +609,10 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) { struct block *new_block; - new_block = (i == GLOBAL_BLOCK - ? allocate_global_block (&objfile->objfile_obstack) - : allocate_block (&objfile->objfile_obstack)); + if (i == GLOBAL_BLOCK) + new_block = new (&objfile->objfile_obstack) global_block; + else + new_block = new (&objfile->objfile_obstack) block; new_block->set_multidict (mdict_create_linear (&objfile->objfile_obstack, NULL)); new_block->set_superblock (block_iter); diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index b6a0b3c07df..18b59cff6bf 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -4714,7 +4714,7 @@ static struct block * new_block (struct objfile *objfile, enum block_type type, enum language language) { - struct block *retval = allocate_block (&objfile->objfile_obstack); + struct block *retval = new (&objfile->objfile_obstack) block; if (type == FUNCTION_BLOCK) retval->set_multidict (mdict_create_linear_expandable (language)); -- 2.39.0