From patchwork Mon Apr 14 16:31:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 110409 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 32F1F385842D for ; Mon, 14 Apr 2025 16:58:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32F1F385842D Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=HTo4/omv X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id AEF923857BBF for ; Mon, 14 Apr 2025 16:31:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEF923857BBF 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 AEF923857BBF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::435 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744648305; cv=none; b=Jh9dNVqcp+jHXCgBqpY54fboTNOnyihj5UiuQ8n3pb6a7NUAB34TVHoKB9Nd3EsTlL8swCxOuoRTa6SEwuJHiLgv13IZrpx0vGDqMy7LwwOm429dvhRWwmjPZhZALMdGNMI4UHk4iqFvvZzM1S7/fF43/uEawLcNmMem1SDv1lk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744648305; c=relaxed/simple; bh=4wM3BlWsUuk/yV/y+jyrLCT+gpCTsqFin36saVYTrmQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=nNN0WC1W9z0qWo5IsCYNHBTovSieVdwpgI+v2OKqN4H2y3CfxFKmhFIitEGygpDY27HsKf7eHir5lIBV1pqrLvrZUH50Uuoh2vd+CBZoDDVV/yeKDXcRIB36whPCN4grBpnEE//FWoo1ZZVOTa6UeMqH/hIwjhndU22QRLjTYn0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEF923857BBF Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-391342fc1f6so3836786f8f.1 for ; Mon, 14 Apr 2025 09:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1744648302; x=1745253102; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l3ECdUUkNl7AhqkMzJ9xkguYCQvH43nNz7ImboEk+AU=; b=HTo4/omvs4L60GpQiYeVVaqRhWUGAzE387YdxhZoEB1ieEpV7uKzyrmUUow1zJ8YdR fqxAcpVf0AVlTHEvQy3hyc/RoM1MQzm35dEW6XjygCThC/krEuT8BcBcJJeW7ARm86TC hgJEWI+VM1MU1zQ87Z4k9w7pgG1YQ0Ho9EgfH/nfMz2K/uguGHQQ0ekSliUZ/NrKFctV t94e/h5w4o+PGSjzRXZR5U/57fYAJlUOYGq7TMAszCGbELJ0Dj8SNVfSFnwNq+ko/Ilp 32iIamkgVa/xCU0kY9YSdA4SNkmPEpYUkBOZg7w+5jcQAeVfZ3a/cUCEK3r92QP4FRSW AyBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744648302; x=1745253102; h=content-transfer-encoding:mime-version: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=l3ECdUUkNl7AhqkMzJ9xkguYCQvH43nNz7ImboEk+AU=; b=OLJyq5j90y044PThLyL2BRM0nL64OTryu6S4xZgZXf1WlXpQyNlc994Y8Xz9BZvImS j/8P029qmJCIRy8+y45k7nYneUH4X5wc+h5IpfB7sQerZszdEENI0otrrIlB91SvoUUA c5Z6SSKlHSr2L1RipGoYvevIB0JcgXQE6MG3/DAftE7fDFFYwG6QSDFfjDgsW5HQU4Px YnLKvvYWwMxSD/KDy1RHCGfVj+VKR5XH2tu42CkupGLJl4QAf/AZHmuOlN7CBl7qpl1i /KUtma0wggPuUcVXpdXd+WikjQ+8q5lnzRtc+4qn7HasLw799rsJJ31QwJUJa/tPYvsA 1Oag== X-Gm-Message-State: AOJu0YxERuMUR9tJpu8daI7aPHRuJpLT4raJGer2cKeFtRKMGU3UCmwA 91+aflL3sEme9RC2Kp+SAxjfxNGoL6/ergjXGKRDMg4I2cdpYVGoZ7KIEoZ2Hqh9uYJtTMdH44B o0A== X-Gm-Gg: ASbGncs+44k+QRGlRLzP7oslKFijvxmvXR3w6XslyLJYbls6/EW+f8v7Q8Msbx2aNuJ /QXmbTE5/VJv7nYI9sbwpeT0gkmyZ8yEr1CD8vVBHR5jJ7+fIC8fx7uEQPXHaKOXKOvYOM/cCFM eBa8SiKSfO+J8Yj9/nKCHVBudjianhskVxshWVfEjcvzseps5VBWTiZpELTLkLvjFYgawcVArJ/ oifuBoumcs0prnGHip+BI9rKhUQBiGlSSxLxV87locouJYQIfkQbgo3Jy408SmN+vdh3Hvtp+0A QreqRgEHuvqTIb8DA9PN7AD3WlP4eGbo0ixrinn/ztIDRBa1zg== X-Google-Smtp-Source: AGHT+IFwW1YNGOxbInIC50VgA5D8pwPBb1O9A/nQ6Zuzl8vn7xb+yKrqDrEvl8HW/aQZdOa8+EepRQ== X-Received: by 2002:a05:6000:4205:b0:391:3cb0:3d8d with SMTP id ffacd0b85a97d-39ea5201388mr8727884f8f.19.1744648302422; Mon, 14 Apr 2025 09:31:42 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:23:71c0:c543:1fff:77d1:f317]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39ed15caa5asm6399335f8f.20.2025.04.14.09.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 09:31:42 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [COMMITTED 13/19] gccrs: Fix const checking of enum discriminants Date: Mon, 14 Apr 2025 18:31:33 +0200 Message-ID: <20250414163138.506753-14-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250414163138.506753-2-arthur.cohen@embecosm.com> References: <20250414163138.506753-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.3 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 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: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org From: Owen Avery gcc/rust/ChangeLog: * checks/errors/rust-const-checker.cc (ConstChecker::visit): Visit the enum items of enums. * resolve/rust-ast-resolve-item.cc (ResolveItem::visit): Resolve enum discriminants during nr1.0. gcc/testsuite/ChangeLog: * rust/compile/enum_discriminant2.rs: New test. Signed-off-by: Owen Avery --- gcc/rust/checks/errors/rust-const-checker.cc | 3 +++ gcc/rust/resolve/rust-ast-resolve-item.cc | 2 ++ gcc/testsuite/rust/compile/enum_discriminant2.rs | 9 +++++++++ 3 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/rust/compile/enum_discriminant2.rs diff --git a/gcc/rust/checks/errors/rust-const-checker.cc b/gcc/rust/checks/errors/rust-const-checker.cc index 4904322b938..4c2257a2455 100644 --- a/gcc/rust/checks/errors/rust-const-checker.cc +++ b/gcc/rust/checks/errors/rust-const-checker.cc @@ -646,6 +646,9 @@ ConstChecker::visit (Enum &enum_item) { check_default_const_generics (enum_item.get_generic_params (), ConstGenericCtx::Enum); + + for (auto &item : enum_item.get_variants ()) + item->accept_vis (*this); } void diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc index d584961354f..30f6d430b86 100644 --- a/gcc/rust/resolve/rust-ast-resolve-item.cc +++ b/gcc/rust/resolve/rust-ast-resolve-item.cc @@ -356,6 +356,8 @@ ResolveItem::visit (AST::EnumItemDiscriminant &item) auto cpath = canonical_prefix.append (decl); mappings.insert_canonical_path (item.get_node_id (), cpath); + + ResolveExpr::go (item.get_expr (), path, cpath); } void diff --git a/gcc/testsuite/rust/compile/enum_discriminant2.rs b/gcc/testsuite/rust/compile/enum_discriminant2.rs new file mode 100644 index 00000000000..351dfbb6f85 --- /dev/null +++ b/gcc/testsuite/rust/compile/enum_discriminant2.rs @@ -0,0 +1,9 @@ +fn test() -> isize { + 1 +} + +enum Foo { + Bar = test() // { dg-error "only functions marked as .const." } +} + +fn main() {}