From patchwork Tue Mar 28 15:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 76164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2321738vqo; Tue, 28 Mar 2023 08:53:53 -0700 (PDT) X-Google-Smtp-Source: AKy350Y9ym0wCajU8vNWDwdifIKXWIVrsygeBm/xtTMI7IdBlZKYvoFY2DgvS0CpNMLiH2ZKr87N X-Received: by 2002:aa7:dac6:0:b0:4fd:2363:16fa with SMTP id x6-20020aa7dac6000000b004fd236316famr14261537eds.41.1680018833136; Tue, 28 Mar 2023 08:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680018833; cv=none; d=google.com; s=arc-20160816; b=NoWgSDWTi8bPefAvJYJGClBXnuOC0X7QMPnopsKX7IBDeSvz2q4gv1WDprBa+d/0BI IXC8sW+FQt87738ggoLvpniAYkIiU6JQA9nb7UvhLqNwmSfvbKg04L6H61oA6VkyMdGE sSSKmqW3azTZ1oEL27ozEejqksBU2wZQYSSZd19lAqFbAYiWzU07HHgKyQYfEmZZ2h+E n5eOt6CcIAMrGZ8kKKXHwctiPkZaUoHtnfr6zLkSc+HTxePClOQmKjsCijtD6s7KbdEC bW0yD8/rUe1Hh1US7P/pKo+Kh8zrCJ+XmlTM5VgxgzgIwtaH6NzzGX+iM/t4V2GlA3ms HhVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Dlk6sqM9kfZqPagaUi3fiP8vbQkGOdT42mykXVXgYVg=; b=dP9Jj2Pkv5Zu1xLVzHnuVISHG5bCq6P48GIXscv9/OIxN1N3CXErTXSgNICTNXE6GF GTOirG0UeEgvbE4q6+eZ+OpEYbcsBrj25XzcRtcMzHUFZvpmkVw9L4E6LCvcIbLE07Tk pxsVCV8PUGhvFNc1OfrUYxaZ6b4oSFEMfEoYCphKmk0GyDZWk6AxdpmuBi9fuOwFWQV0 6YYF6p4wjRgfZxLeT8WtyOtF8rLplx/OuUgiwia/Jne7NSQxHTtbb6mrSueOz+KvPOxW o0Zu+lC6yQ/IKIeyyXtSH3gln6Rr4DtoL7k+k/eDzEcDWLq7w5Jl1o0Kc9Sv5LEJwg4w FnUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iM+lGBOZ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y8-20020a50e608000000b004ad4c17aa75si30505034edm.425.2023.03.28.08.53.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 08:53:53 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=iM+lGBOZ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4EDE238708C4 for ; Tue, 28 Mar 2023 15:53:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4EDE238708C4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680018783; bh=Dlk6sqM9kfZqPagaUi3fiP8vbQkGOdT42mykXVXgYVg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=iM+lGBOZWa3C14KA373u7t+FMgkUp1V92pyKMlbMB6BVsSoC2EhcXF22v+IT81jo4 HppcHugSIKUbECve6pPcWg99AjrkQnUbmY+ZSiBsRTSNKyDOrPDrpotRzVKCclMyiM zsjcoyvfgsF3i/Mrd2FBOkRlvzo7clwS1hY1ORiw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0DD8A3858020 for ; Tue, 28 Mar 2023 15:51:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0DD8A3858020 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-428-8xrWV6d_NB-XqKH6U33h4Q-1; Tue, 28 Mar 2023 11:50:58 -0400 X-MC-Unique: 8xrWV6d_NB-XqKH6U33h4Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 174D085A588 for ; Tue, 28 Mar 2023 15:50:58 +0000 (UTC) Received: from localhost (unknown [10.33.36.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFAE5202701E; Tue, 28 Mar 2023 15:50:57 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: Jason Merrill Subject: [PATCH] c++: Make diagnostic translatable [PR109309] Date: Tue, 28 Mar 2023 16:50:57 +0100 Message-Id: <20230328155057.1187204-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761627427980678048?= X-GMAIL-MSGID: =?utf-8?q?1761627427980678048?= Tested x86_64-linux. OK for trunk? -- >8 -- gcc/cp/ChangeLog: PR c++/109309 * contracts.cc (check_postcondition_result): Use complete strings for diagnostics, so they can be translated. --- gcc/cp/contracts.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index 8aca1bade89..20ae4e3b14b 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -639,12 +639,12 @@ check_postcondition_result (tree decl, tree type, location_t loc) { const char* what; if (DECL_CONSTRUCTOR_P (decl)) - what = "constructor"; + what = "constructor does not return a value to test"; else if (DECL_DESTRUCTOR_P (decl)) - what = "destructor"; + what = "destructor does not return a value to test"; else - what = "function"; - error_at (loc, "%s does not return a value to test", what); + what = "function does not return a value to test"; + error_at (loc, "%s", what); return false; }