From patchwork Tue Jan 30 12:07:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=Xjltkihu; dkim-atps=neutral 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=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPPcy2q0Nz23gZ for ; Tue, 30 Jan 2024 23:29:54 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 614EB3864C69 for ; Tue, 30 Jan 2024 12:29:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 500583857BBE for ; Tue, 30 Jan 2024 12:11:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 500583857BBE Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 500583857BBE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::331 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616732; cv=none; b=IzN1H8kuyQ9ZAIKf1DwEs4CMXDQDYDI/LC0jv5PJgwueEZJOcQFFlhtDR+2N6rKEQiBNrn/SnIpKiArJ48SvbVSTJqrMN3ezf8yv8DPZk+LK57LbMS+bCaeOpYzu3s12XZ4y0+x1DV4c4oUyUr4An02fIFN8pCP9CTROQVr9ayk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616732; c=relaxed/simple; bh=Ds39LoDLj+M3gQei3jOkd99C0LenJ1lfmk8dWl27ock=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=b1SFAN7pOj8tfOkyiwmOiC42DW0GDh+c35st7PSARpWm7cqiwb5DFEatiVjql9eRu3jD/CcHmRXz/6tuKt9G4I75Lj+bmtpWB1Oab+pc2DQLIqM73dNiH6qoBzM6FO/n27rgc3lne+rIZvT59vVfoneG1o/02LbM2n9n7qh0FGY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40ef64d8955so18171315e9.3 for ; Tue, 30 Jan 2024 04:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616698; x=1707221498; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=33Q1RklMH1x9+FInnB0kn2J5J5csXIpLWJpJhfDOmIo=; b=Xjltkihua3BjipfuJhgr1J+b3W+pvhWXt8eaNSJ8z94gmrs7dJhoMIq/8v9qsc0rSH sNc7f3pxCy1EreNUwm3mFvxokvYgompYjbfDUdAgG6FhamXeMa5nAx1GdJMyi28Z9KJN tdu1KpZ6AiP3OZDhpIaNDrWQpb6Zb3cXsCDtP8aC6cQjQcSQTOfIs3TCm5hqDjoAdxr9 NHgCnXSeFLpPzU6jitpAg+hHj2UdpRelhQI+TZ9FXQCwgQgAZPUBb3tGVb1Ygzfc0Zg1 3GFFKautuSjWQ9yh3GfnODrLs0a95pejk61+VkIfILB/iyc+W11wA/BB08WjIEDqqxCZ JyHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616698; x=1707221498; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=33Q1RklMH1x9+FInnB0kn2J5J5csXIpLWJpJhfDOmIo=; b=sjZdRH1cxe3LXIM/fORDMVduwQONaZvELCWmEOPXcQZmep10xQwTtmpSVRTv5VZGBg BfMy9HkZkxS488BN8Nq0BAB7PIvpa0mx2hxiY4T2e842b39n7D+nmJLIIRG5YG5H6W0S BHdToyQcDscrizbg4mOFLbaEDjQxrg1mM0qtIeKfXwBlnae28fEuv+2LrBX0FQz7qpMb 3I3yIA0Ss+7zS7mRa+VWisTpLNR2sm7XmC5SnWyogJ8HSAjgTM6CPALEDfYanhAXvRKY GXank+l2vsBE0cJvPIa1gyhA8zB9HhwGPbU2X06WQKb3gAPhQtMl/Nq3w+p2cg6Hy1b5 7OTw== X-Gm-Message-State: AOJu0YwxvA4BlKIiQrkxaS4N0S5OQj+/ZZbnXWtLEZDW89JTFNMj16Vu eeijosb2qpHLBdpTpEFr+rxA56gUVHd3mkgIYuzm70H4Y/xS5+fZ2+j64l1odEXM8Flr8eaVazq EUg== X-Google-Smtp-Source: AGHT+IEjOWXg0e7RWGrahhTv3+ps3vbwuM5F7EqaTzlsg2aGoadrfNkZs9Rvsy3g59d/jef8OpzqYQ== X-Received: by 2002:a05:600c:4f92:b0:40e:6650:b883 with SMTP id n18-20020a05600c4f9200b0040e6650b883mr6661161wmq.18.1706616697722; Tue, 30 Jan 2024 04:11:37 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:37 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Nobel Singh Subject: [COMMITTED 065/101] gccrs: Generate error for const trait functions Date: Tue, 30 Jan 2024 13:07:21 +0100 Message-ID: <20240130121026.807464-68-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Nobel Singh Fixes issue #2040 Add check to assure that a function cant be declared const inside trait impl blocks. gcc/rust/ChangeLog: * checks/errors/rust-ast-validation.cc (ASTValidation::visit): Add check for const funtion. gcc/testsuite/ChangeLog: * rust/compile/issue-2040.rs: New test. Signed-off-by: Nobel Singh --- gcc/rust/checks/errors/rust-ast-validation.cc | 4 ++++ gcc/testsuite/rust/compile/issue-2040.rs | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 gcc/testsuite/rust/compile/issue-2040.rs diff --git a/gcc/rust/checks/errors/rust-ast-validation.cc b/gcc/rust/checks/errors/rust-ast-validation.cc index 6fb142c7845..cd197fc1ea7 100644 --- a/gcc/rust/checks/errors/rust-ast-validation.cc +++ b/gcc/rust/checks/errors/rust-ast-validation.cc @@ -103,6 +103,10 @@ ASTValidation::visit (AST::Function &function) rust_error_at (function.get_locus (), "functions cannot be both % and %"); + if (qualifiers.is_const () && context.back () == Context::TRAIT_IMPL) + rust_error_at (function.get_locus (), ErrorCode::E0379, + "functions in traits cannot be declared const"); + if (valid_context.find (context.back ()) == valid_context.end () && function.has_self_param ()) rust_error_at ( diff --git a/gcc/testsuite/rust/compile/issue-2040.rs b/gcc/testsuite/rust/compile/issue-2040.rs new file mode 100644 index 00000000000..fbac168b9f3 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2040.rs @@ -0,0 +1,12 @@ +trait Foo { + fn f() -> u32; +} + +impl Foo for u32 { + const fn f() -> u32 { + // { dg-error "functions in traits cannot be declared const" "" { target *-*-* } .-1 } + 22 + } +} + +fn main() {}