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: 1762377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=KGo9zWHB; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PmDj52yVJz1yYV for ; Wed, 29 Mar 2023 02:52:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4AD24384D1B0 for ; Tue, 28 Mar 2023 15:52:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4AD24384D1B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680018759; bh=Dlk6sqM9kfZqPagaUi3fiP8vbQkGOdT42mykXVXgYVg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=KGo9zWHBj48aInqjesxUrN3Jt9AUtf0C9bBLQxtjzbre9OKH82oAX8Glbp9LMYzqG oxnIYdprVrh95qp17kOD0i87KGQSwPAdnktTChpdZ99eCf9K/k+rdERvuLta6HfU4A X6fb2YiwLg0cfc8NPaHRq30JTjCmgR1AHFsitDyA= 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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; }