From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id IJ81KeyY718XTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:32 -0500 Received: by simark.ca (Postfix, from userid 112) id 94BFC1F0B8; Fri, 1 Jan 2021 16:49:32 -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 5DBB91F0C5 for ; Fri, 1 Jan 2021 16:49:30 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 08B753938C2E; Fri, 1 Jan 2021 21:48:56 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id A2004389FC1F for ; Fri, 1 Jan 2021 21:48:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A2004389FC1F 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 4D5202783092 for ; Fri, 1 Jan 2021 15:48:52 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSI0ka1sznPrxvSI0kleKC; Fri, 01 Jan 2021 15:48:52 -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=jpdk4teX0WwuZ1yKDHZXUs1d2nI3d4jUjBjeytjZogI=; b=MeQGxUj8X6HRhfuL/mHB+DVUtB cF3EQgGXLio/QrysO3HJsv4hbHDEs7CjW9ycAKR1MTclZf6TF7ApDPm83LvGVOtb6dvtcDckY4rQI LrGPKUN+y2CoYaKARKCaaEhvt; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60424 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 1kvSI0-0029vv-34 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 171/203] Remove use of op_string Date: Fri, 1 Jan 2021 14:46:51 -0700 Message-Id: <20210101214723.1784144-172-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: 1kvSI0-0029vv-34 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60424 X-Source-Auth: tom+tromey.com X-Email-Count: 172 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" After switching to the new expression implementation, there will no need for op_string. Before deleting it, the one call outside of the expression-printing code must be removed. That is what this patch does. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_value_binop): Do not use op_string. --- gdb/ChangeLog | 4 ++++ gdb/ada-lang.c | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f3f8642cf9d..657ef37dca7 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -9450,7 +9450,20 @@ ada_value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op) v2 = value_as_long (arg2); if (v2 == 0) - error (_("second operand of %s must not be zero."), op_string (op)); + { + const char *name; + if (op == BINOP_MOD) + name = "mod"; + else if (op == BINOP_DIV) + name = "/"; + else + { + gdb_assert (op == BINOP_REM); + name = "rem"; + } + + error (_("second operand of %s must not be zero."), name); + } if (type1->is_unsigned () || op == BINOP_MOD) return value_binop (arg1, arg2, op); -- 2.26.2