From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway23.websitewelcome.com (gateway23.websitewelcome.com [192.185.48.84]) by sourceware.org (Postfix) with ESMTPS id 23E16383E82B for ; Wed, 22 Jul 2020 03:34:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 23E16383E82B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 513BB71B7 for ; Tue, 21 Jul 2020 22:34:49 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id y5WrjqRXBBb5dy5Wrjdwxn; Tue, 21 Jul 2020 22:34:49 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=b26axDYLeOYBUJXaH8e+HXeHxiZeWlkx0l60i5QiPAI=; b=RZ7/7do9mLgiGr6QOqisKUfNyx hbIWORmiIrXX24MXNpFfcZDDkTrC2knm7OVvTuWJSnJF6umMafisBLz/nlTXds+Lztbkp5VSPI5Bo wxCPxOcA5uRv4xFmC3yX5mI0A; Received: from 174-16-104-48.hlrn.qwest.net ([174.16.104.48]:44534 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jy5Wq-000kGI-PY; Tue, 21 Jul 2020 21:34:48 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 8/9] Change program_space::ebfd to a gdb_bfd_ref_ptr Date: Tue, 21 Jul 2020 21:34:43 -0600 Message-Id: <20200722033444.18522-9-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200722033444.18522-1-tom@tromey.com> References: <20200722033444.18522-1-tom@tromey.com> 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: 174.16.104.48 X-Source-L: No X-Exim-ID: 1jy5Wq-000kGI-PY X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-104-48.hlrn.qwest.net (bapiya.Home) [174.16.104.48]:44534 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3035.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_PASS, TXREP, T_SPF_TEMPERROR, URIBL_CSS, URIBL_CSS_A autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-List-Received-Date: Wed, 22 Jul 2020 03:34:58 -0000 This changes program_space::ebfd to a gdb_bfd_ref_ptr, removing some manual management. gdb/ChangeLog 2020-07-21 Tom Tromey * exec.c (exec_file_attach): Update. * progspace.c (program_space::exec_close): Update. * progspace.h (struct program_space) : Now a gdb_bfd_ref_ptr. : Change argument type. : Update. --- gdb/ChangeLog | 9 +++++++++ gdb/exec.c | 2 +- gdb/progspace.c | 6 ++---- gdb/progspace.h | 8 ++++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gdb/exec.c b/gdb/exec.c index 75f3990e0f0..ee5e948ec75 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -450,7 +450,7 @@ exec_file_attach (const char *filename, int from_tty) FOPEN_RUB, scratch_chan); else temp = gdb_bfd_open (canonical_pathname, gnutarget, scratch_chan); - current_program_space->set_exec_bfd (temp.release ()); + current_program_space->set_exec_bfd (std::move (temp)); if (!current_program_space->exec_bfd ()) { diff --git a/gdb/progspace.c b/gdb/progspace.c index 49243a6394d..15cdc9f90e1 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -223,13 +223,11 @@ program_space::solibs () const void program_space::exec_close () { - if (ebfd) + if (ebfd != nullptr) { - gdb_bfd_unref (ebfd); - /* Removing target sections may close the exec_ops target. Clear ebfd before doing so to prevent recursion. */ - ebfd = NULL; + ebfd.reset (nullptr); ebfd_mtime = 0; remove_target_sections (&ebfd); diff --git a/gdb/progspace.h b/gdb/progspace.h index 5f952ea9b84..70b32198c20 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -279,13 +279,13 @@ struct program_space /* Return the exec BFD for this program space. */ bfd *exec_bfd () const { - return ebfd; + return ebfd.get (); } /* Set the exec BFD for this program space to ABFD. */ - void set_exec_bfd (bfd *abfd) + void set_exec_bfd (gdb_bfd_ref_ptr &&abfd) { - ebfd = abfd; + ebfd = std::move (abfd); } /* Unique ID number. */ @@ -295,7 +295,7 @@ struct program_space managed by the exec target. */ /* The BFD handle for the main executable. */ - bfd *ebfd = NULL; + gdb_bfd_ref_ptr ebfd; /* The last-modified time, from when the exec was brought in. */ long ebfd_mtime = 0; /* Similar to bfd_get_filename (exec_bfd) but in original form given -- 2.17.2