From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2DsPKNmY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:13 -0500 Received: by simark.ca (Postfix, from userid 112) id A05771F0BC; Fri, 1 Jan 2021 16:49:13 -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.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [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 383511E590 for ; Fri, 1 Jan 2021 16:49:04 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2FB7384403E; Fri, 1 Jan 2021 21:48:40 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 8C3E83896C14 for ; Fri, 1 Jan 2021 21:48:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8C3E83896C14 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 2E8AE10BE649 for ; Fri, 1 Jan 2021 15:48:34 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHika1i0nPrxvSHikle9K; Fri, 01 Jan 2021 15:48:34 -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=uyLtqMbRhQ/kULiVjs06MorNi10lwUyvwjI2N7xv1x4=; b=hd/hUK4HD4Me4rchunhQS7z53w 9yMPJW1pxl3P35kwI66+/Kri+nC9/jDkYTI9OOzIdVI8CPfpGD+HgHD0BX5S1vY+v/ePMeGzmuafy 3jsOHraJuenkYTcA/3ZRMaaH/; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60414 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 1kvSHi-0029lU-00 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:34 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 140/203] Introduce class adl_func_operation Date: Fri, 1 Jan 2021 14:46:20 -0700 Message-Id: <20210101214723.1784144-141-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: 1kvSHi-0029lU-00 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60414 X-Source-Auth: tom+tromey.com X-Email-Count: 141 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 adds class adl_func_operation, which implements argument-dependent lookup function calls. Other function calls will be handled in a different way. However, because ADL calls were created in a single spot in the C++ parser, and because they had different semantics from the other cases, it was convenient to treat them specially. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class adl_func_operation): New. * eval.c (adl_func_operation::evaluate): New method. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 23 +++++++++++++++++++++++ gdb/expop.h | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/gdb/eval.c b/gdb/eval.c index 495cd4b26a3..62b3f219ca4 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2524,6 +2524,29 @@ logical_or_operation::evaluate (struct type *expect_type, } } +value * +adl_func_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + std::vector &arg_ops = std::get<2> (m_storage); + std::vector args (arg_ops.size ()); + for (int i = 0; i < arg_ops.size (); ++i) + args[i] = arg_ops[i]->evaluate_with_coercion (exp, noside); + + struct symbol *symp; + find_overload_match (args, std::get<0> (m_storage).c_str (), + NON_METHOD, + nullptr, nullptr, + nullptr, &symp, nullptr, 0, noside); + if (SYMBOL_TYPE (symp)->code () == TYPE_CODE_ERROR) + error_unknown_type (symp->print_name ()); + value *callee = evaluate_var_value (noside, std::get<1> (m_storage), symp); + return evaluate_subexp_do_call (exp, noside, callee, args, + nullptr, expect_type); + +} + } struct value * diff --git a/gdb/expop.h b/gdb/expop.h index f858f591baf..a8aa0f43acc 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -2027,6 +2027,25 @@ class logical_or_operation override; }; +/* This class implements ADL (aka Koenig) function calls for C++. It + holds the name of the function to call, the block in which the + lookup should be done, and a vector of arguments. */ +class adl_func_operation + : public tuple_holding_operation> +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return OP_ADL_FUNC; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2