From patchwork Fri Feb 10 21:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64733 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 7936F3887F66 for ; Fri, 10 Feb 2023 23:22:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 3C31A385840D for ; Fri, 10 Feb 2023 23:21:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C31A385840D 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id A94C41004810E for ; Fri, 10 Feb 2023 23:21:36 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id Qci0pUfClO9zKQci0pxKaQ; Fri, 10 Feb 2023 23:21:36 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=VccygHl9 c=1 sm=1 tr=0 ts=63e6d180 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=7d_E57ReAAAA:8 a=R80hmTpovpAVeOU5vtMA:9 a=QEXdDO2ut3YA:10:nop_charset_2 a=FboEE2QesbCFu_iVERDm:22 a=jhqOcbufqs7Y1TYCrUUU:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=8ECM7XZL8dqVfjDmocIZEGDpABF6X9ECr41LJtdsWl4=; b=XlcVjBFfDRQJeVxzOM7OZqqE53 pfN02E4OZ+cd7RzSgWtwG/oal7ZUraGLPA9dcazatDW0aeNguLDfwa99IidVwEQ5g89D15iISfHP8 juXPFZlvUFr8w0O0V8hjX3o+8; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:57244 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pQbJu-000WcR-Cu; Fri, 10 Feb 2023 14:52:38 -0700 From: Tom Tromey Date: Fri, 10 Feb 2023 14:52:58 -0700 Subject: [PATCH v2 40/48] Turn some xmethod functions into methods MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v2-40-b0b27fd97177@tromey.com> References: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> To: gdb-patches@sourceware.org Cc: Simon Marchi X-Mailer: b4 0.12.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: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pQbJu-000WcR-Cu X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:57244 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.5 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 turns value_from_xmethod, result_type_of_xmethod, and call_xmethod to be methods of value. value_from_xmethod is a static "constructor" now. Approved-By: Simon Marchi --- gdb/eval.c | 4 ++-- gdb/valarith.c | 8 ++++---- gdb/valops.c | 2 +- gdb/value.c | 22 +++++++++++----------- gdb/value.h | 22 +++++++++++----------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 808cc916bb4..b263dc998d6 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -640,7 +640,7 @@ evaluate_subexp_do_call (expression *exp, enum noside noside, } else if (ftype->code () == TYPE_CODE_XMETHOD) { - type *return_type = result_type_of_xmethod (callee, argvec); + type *return_type = callee->result_type_of_xmethod (argvec); if (return_type == NULL) error (_("Xmethod is missing return type.")); @@ -678,7 +678,7 @@ evaluate_subexp_do_call (expression *exp, enum noside noside, return call_internal_function (exp->gdbarch, exp->language_defn, callee, argvec.size (), argvec.data ()); case TYPE_CODE_XMETHOD: - return call_xmethod (callee, argvec); + return callee->call_xmethod (argvec); default: return call_function_by_hand (callee, default_return_type, argvec); } diff --git a/gdb/valarith.c b/gdb/valarith.c index 328781ba784..117662fda95 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -513,13 +513,13 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op, if (noside == EVAL_AVOID_SIDE_EFFECTS) { struct type *return_type - = result_type_of_xmethod (argvec[0], argvec.slice (1)); + = argvec[0]->result_type_of_xmethod (argvec.slice (1)); if (return_type == NULL) error (_("Xmethod is missing return type.")); return value::zero (return_type, VALUE_LVAL (arg1)); } - return call_xmethod (argvec[0], argvec.slice (1)); + return argvec[0]->call_xmethod (argvec.slice (1)); } if (noside == EVAL_AVOID_SIDE_EFFECTS) { @@ -626,13 +626,13 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside) if (noside == EVAL_AVOID_SIDE_EFFECTS) { struct type *return_type - = result_type_of_xmethod (argvec[0], argvec[1]); + = argvec[0]->result_type_of_xmethod (argvec[1]); if (return_type == NULL) error (_("Xmethod is missing return type.")); return value::zero (return_type, VALUE_LVAL (arg1)); } - return call_xmethod (argvec[0], argvec[1]); + return argvec[0]->call_xmethod (argvec[1]); } if (noside == EVAL_AVOID_SIDE_EFFECTS) { diff --git a/gdb/valops.c b/gdb/valops.c index 137134abe6c..89bd5c95a2c 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -3028,7 +3028,7 @@ find_overload_match (gdb::array_view args, method_oload_champ, basetype, boffset); } else - *valp = value_from_xmethod + *valp = value::from_xmethod (std::move (xmethods[ext_method_oload_champ])); } else diff --git a/gdb/value.c b/gdb/value.c index b36c77694f6..cccb02411c6 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -2355,7 +2355,7 @@ show_convenience (const char *ignore, int from_tty) /* See value.h. */ struct value * -value_from_xmethod (xmethod_worker_up &&worker) +value::from_xmethod (xmethod_worker_up &&worker) { struct value *v; @@ -2367,26 +2367,26 @@ value_from_xmethod (xmethod_worker_up &&worker) return v; } -/* Return the type of the result of TYPE_CODE_XMETHOD value METHOD. */ +/* See value.h. */ struct type * -result_type_of_xmethod (struct value *method, gdb::array_view argv) +value::result_type_of_xmethod (gdb::array_view argv) { - gdb_assert (method->type ()->code () == TYPE_CODE_XMETHOD - && method->m_lval == lval_xcallable && !argv.empty ()); + gdb_assert (type ()->code () == TYPE_CODE_XMETHOD + && m_lval == lval_xcallable && !argv.empty ()); - return method->m_location.xm_worker->get_result_type (argv[0], argv.slice (1)); + return m_location.xm_worker->get_result_type (argv[0], argv.slice (1)); } -/* Call the xmethod corresponding to the TYPE_CODE_XMETHOD value METHOD. */ +/* See value.h. */ struct value * -call_xmethod (struct value *method, gdb::array_view argv) +value::call_xmethod (gdb::array_view argv) { - gdb_assert (method->type ()->code () == TYPE_CODE_XMETHOD - && method->m_lval == lval_xcallable && !argv.empty ()); + gdb_assert (type ()->code () == TYPE_CODE_XMETHOD + && m_lval == lval_xcallable && !argv.empty ()); - return method->m_location.xm_worker->invoke (argv[0], argv.slice (1)); + return m_location.xm_worker->invoke (argv[0], argv.slice (1)); } /* Extract a value as a C number (either long or double). diff --git a/gdb/value.h b/gdb/value.h index 8f4636ed6b4..573b5e14319 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -542,6 +542,17 @@ struct value WHOLE --- regardless of what kind of lvalue WHOLE is. */ void set_component_location (const struct value *whole); + /* Build a value wrapping and representing WORKER. The value takes + ownership of the xmethod_worker object. */ + static struct value *from_xmethod (xmethod_worker_up &&worker); + + /* Return the type of the result of TYPE_CODE_XMETHOD value METHOD. */ + struct type *result_type_of_xmethod (gdb::array_view argv); + + /* Call the xmethod corresponding to the TYPE_CODE_XMETHOD value + METHOD. */ + struct value *call_xmethod (gdb::array_view argv); + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -1478,17 +1489,6 @@ struct value *call_internal_function (struct gdbarch *gdbarch, const char *value_internal_function_name (struct value *); -/* Build a value wrapping and representing WORKER. The value takes ownership - of the xmethod_worker object. */ - -extern struct value *value_from_xmethod (xmethod_worker_up &&worker); - -extern struct type *result_type_of_xmethod (struct value *method, - gdb::array_view argv); - -extern struct value *call_xmethod (struct value *method, - gdb::array_view argv); - /* Destroy the values currently allocated. This is called when GDB is exiting (e.g., on quit_force). */ extern void finalize_values ();