From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id oJqQNAaZ71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:58 -0500 Received: by simark.ca (Postfix, from userid 112) id 9DD891F0BE; Fri, 1 Jan 2021 16:49:55 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B6D121F0C9 for ; Fri, 1 Jan 2021 16:49:46 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD4FF393BC36; Fri, 1 Jan 2021 21:49:13 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id AF1A5393BC06 for ; Fri, 1 Jan 2021 21:49:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AF1A5393BC06 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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 520C131A66 for ; Fri, 1 Jan 2021 15:49:06 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSIEk11OoiQiZvSIEki8Zw; Fri, 01 Jan 2021 15:49:06 -0600 X-Authority-Reason: nr=8 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:To:From:Sender:Reply-To:Cc: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=1beV33+hNk5I9fIkfW1FMtvmrwM8LPwsWBVQs/T7RkI=; b=no3oDmhHD+s0hfa7y2j5opQd4M Koz5M5Cr4w23+AADJH77JH+67F9KUa0pOY2I09wYjyw+YEpkmr6nC0Uo9XK4C2qH1Cib2jaV4z2rY GLAqSO9Xf/Hf7kHt3YltM6e3y; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60430 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kvSIE-002A5T-4p for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:49:06 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 198/203] Inline expr_builder methods Date: Fri, 1 Jan 2021 14:47:18 -0700 Message-Id: <20210101214723.1784144-199-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-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.81.39 X-Source-L: No X-Exim-ID: 1kvSIE-002A5T-4p X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60430 X-Source-Auth: tom+tromey.com X-Email-Count: 199 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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@sourceware.org Sender: "Gdb-patches" This inlines the expr_builder constructor and release method. These are straightforward, so this seemed simpler. gdb/ChangeLog 2021-01-01 Tom Tromey * parser-defs.h (struct expr_builder) : Inline. : Inline. * parse.c (expr_builder::expr_builder, expr_builder::release): Remove. --- gdb/ChangeLog | 7 +++++++ gdb/parse.c | 14 -------------- gdb/parser-defs.h | 10 ++++++++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gdb/parse.c b/gdb/parse.c index 0c4a2c6fa01..8cdaa83b60b 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -91,20 +91,6 @@ innermost_block_tracker::update (const struct block *b, -/* See definition in parser-defs.h. */ - -expr_builder::expr_builder (const struct language_defn *lang, - struct gdbarch *gdbarch) - : expout (new expression (lang, gdbarch)) -{ -} - -expression_up -expr_builder::release () -{ - return std::move (expout); -} - /* Return the type of MSYMBOL, a minimal symbol of OBJFILE. If ADDRESS_P is not NULL, set it to the MSYMBOL's resolved address. */ diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h index b6cf4a694c7..31be5e80bd9 100644 --- a/gdb/parser-defs.h +++ b/gdb/parser-defs.h @@ -42,13 +42,19 @@ struct expr_builder And GDBARCH is the gdbarch to use during parsing. */ expr_builder (const struct language_defn *lang, - struct gdbarch *gdbarch); + struct gdbarch *gdbarch) + : expout (new expression (lang, gdbarch)) + { + } DISABLE_COPY_AND_ASSIGN (expr_builder); /* Resize the allocated expression to the correct size, and return it as an expression_up -- passing ownership to the caller. */ - ATTRIBUTE_UNUSED_RESULT expression_up release (); + ATTRIBUTE_UNUSED_RESULT expression_up release () + { + return std::move (expout); + } /* Return the gdbarch that was passed to the constructor. */ -- 2.26.2