Message ID | 20240130121026.807464-26-arthur.cohen@embecosm.com |
---|---|
State | Unresolved |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1185109dyb; Tue, 30 Jan 2024 04:31:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvw3+tzbNQq1REzjXvogmI3Zyg15tzQd4sBzYP/duD60xx55tBSRW9yJDXtU1W84JD2WoV X-Received: by 2002:ac8:5bc1:0:b0:42a:75dc:6eca with SMTP id b1-20020ac85bc1000000b0042a75dc6ecamr1356658qtb.44.1706617905337; Tue, 30 Jan 2024 04:31:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706617905; cv=pass; d=google.com; s=arc-20160816; b=FFyIVy6hePmSZj7axdyJDrjIE/NnwYGsaT21G6SQGbl4yjVqs8nAQ5LU5vuM8n2pOv KmWGkvhUegG18kZtKdB3k3CSh9hEOQ3J3lbEyFzrfQG17birnP3H5Lt9sIykjTCy2G2J pliNKuatfGgJf7PJ6iP751Do1oUYNwfGZSJ/fLKquSNOeQuM7UHBM1yHBkp86qSdDCUb V/KcfjsWty/CEBgnfvrp4ArciGGD7pIKGuQIN/NtSPbUnJdQO3ve7Qx+Q5erx0N6L7M4 Sgx5U9bzOYTWZ9IcGEmYLPYSCCuGITMEb2Lzr6GgYcJ52m3iNrDamZ+X3ZXNME91U/Rr YcQw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=KD2ydI9/qQ7fWdczTLRyDZgI5EVQesffVkxsd6WWbig=; fh=s1GzlUPo1djGkCl3rkRJI30hDOSCVwGp0RAbVwQ8dxQ=; b=kcZWnrzeWzVppohO5rqC1Gm7e/CIKgPviDRmpuaECao5UjspUwTgCH8mriUjvFC1xQ ZuNXodX2E63zK3Eg9GnJd2gZT1kk32uKcV82bNnOqMxaxo2D/SK5CZ97vSZQwS+YZ4LQ 4tDaua/47GXvUYWKzXw4T9DbnYb6y9mMXnJWKkqE+sjFA+CJFRwW3te5eMBwWHImU7dx COInf+QAXbhf3HYh5NDzqxvmQybHyZzmqY4iN19gK1+OXKHVOSqazBO9i5Vfqz9/s45b 9VemL9QBXM+QHZ1uI9vn+UAW9D6xHh/k8I+wFfZCXpT0Z4cETZXYnHToYbYN7wI4wrUf uLjQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=MgbZyPde; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id y11-20020a05622a164b00b0042aa62a9292si4459158qtj.38.2024.01.30.04.31.45 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:31:45 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=MgbZyPde; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 654373870857 for <ouuuleilei@gmail.com>; Tue, 30 Jan 2024 12:31:18 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 390DD385829C for <gcc-patches@gcc.gnu.org>; Tue, 30 Jan 2024 12:11:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 390DD385829C 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 390DD385829C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616679; cv=none; b=MvTn/c3OrtW+JDa0du0Q5X1CPXxy0ZzLeQI8NchZVQqssANZnXbvKdGHF7alFJd0mpWYqY1iUDD7BMu8bNGEEdrdi1aHhhLubpg3fR1NliE7y94QgLu7T5CJL0KHlWSVYUy7gRS8voh+neT5mXtVt2VoaeYvFuh1FocXbFgG+GE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616679; c=relaxed/simple; bh=y3e4XIikNWXkKAiG0/1PCyG5rwolRGECA5F5D/FLtOk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=h12XgHYfvM7Fv8VFMhUWZIxjQ+akmotWdetwD0buj0aK0Jr/AUo6EyWrJIeDk7037DUo9VNlG9tUl/4o0kzMXDN57YljVEKIQZmDGMpjLm2GOvmPUb8iN1wTxQs/caiWP+utHCCs3ZLgsGzpTOWDtm0Qhs7SUXc5wVEhXNh6oDg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-33aef64f702so1046705f8f.3 for <gcc-patches@gcc.gnu.org>; Tue, 30 Jan 2024 04:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616667; x=1707221467; 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=KD2ydI9/qQ7fWdczTLRyDZgI5EVQesffVkxsd6WWbig=; b=MgbZyPdeFc+YeAUkDGMNKFKwzlCOxrJj8kWfy1z26o1Uv7bcXXZuvIx6sbBK9CbzV4 D5zNBun6ikNkkNjeS47i+MgKwsPzcrIc1ygl2cU/fQWqqJxTqBfyLvs6RdnkrZMobmF1 mqHIXQ25KNlhxX1S9I2eKVRszYUYuyGCk9dwsOlSPvzEcxJpiv2Hc6S3MpSytDUsPt3+ I6xNnk0WdO6OmRyOZk8Co6vDTian/YLqKaoOlGzqqJFOgccRjTTFNAZb6UjsruYqlmZ5 LkZqsy1RAZrkYduF4kZupCDqoHffRwtCzqUMfhOvFODqztPSJmPG2stMnPSxXAGJnYG2 /0nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616667; x=1707221467; 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=KD2ydI9/qQ7fWdczTLRyDZgI5EVQesffVkxsd6WWbig=; b=PS9X8k0rXNYewhyO//PZrCWjRrXgWBoaM3GQU3IS4gzAEcA5EJzZa5Z/7fpOAp5zWn T/4en6rr0coX14kkqRE/SjrOKuKSCRQmdFVucqLyoXWo0PkR4l4IeOgiYyZHqdEWyVZ3 /6D3bZVwonFLQYxRZA4eJGu5DKuMsYa27yJuIJugnFfYopJtDScB9p7OBitJvW6f7bpZ fsnJ6007RWdH8uHO9sn7xMSKuOQXoHdBgI2yLUXzxkHfXLpZC8zyDjJdW3rhkRJS4X5v /12ZEs9EyiPga+vRoVoC3HhNk0hTHZBxxBe+ACCqR/bhRXMQdPgyVrIv45gqa8u+1xSG MWpg== X-Gm-Message-State: AOJu0YwscLDUZrPjZyGnYa303uA6FnjbV8RquvGgxB25RB2XdjuXnF4R g/VwjNajd7M+FAdZOhr8ax/Goc1t968lOoB3Em7xq40tZub/+L/ote4yOXo3eUCgD0o0vyCazDc NvA== X-Received: by 2002:a05:6000:1972:b0:337:b315:5643 with SMTP id da18-20020a056000197200b00337b3155643mr5887025wrb.6.1706616666775; Tue, 30 Jan 2024 04:11:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:05 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> Subject: [COMMITTED 023/101] gccrs: Add ast validation check on union variant number Date: Tue, 30 Jan 2024 13:06:39 +0100 Message-ID: <20240130121026.807464-26-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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.1 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=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.30 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789518576768534374 X-GMAIL-MSGID: 1789518576768534374 |
Series |
[COMMITTED,001/101] gccrs: Add visibility to trait item
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Arthur Cohen
Jan. 30, 2024, 12:06 p.m. UTC
From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> Unions with zero fields are forbidden. Add regression test for empty unions. gcc/rust/ChangeLog: * checks/errors/rust-ast-validation.cc (ASTValidation::visit): Add zero field check during ast validation pass. * checks/errors/rust-ast-validation.h: Add union visit function prototype. gcc/testsuite/ChangeLog: * rust/compile/const_generics_8.rs: Fill the union with dummy values. * rust/compile/empty_union.rs: New test. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> --- gcc/rust/checks/errors/rust-ast-validation.cc | 10 ++++++++++ gcc/rust/checks/errors/rust-ast-validation.h | 2 ++ gcc/testsuite/rust/compile/const_generics_8.rs | 7 ++++++- gcc/testsuite/rust/compile/empty_union.rs | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/rust/compile/empty_union.rs
diff --git a/gcc/rust/checks/errors/rust-ast-validation.cc b/gcc/rust/checks/errors/rust-ast-validation.cc index 4142cc6317e..dad7f5edded 100644 --- a/gcc/rust/checks/errors/rust-ast-validation.cc +++ b/gcc/rust/checks/errors/rust-ast-validation.cc @@ -18,6 +18,7 @@ #include "rust-ast-validation.h" #include "rust-diagnostics.h" +#include "rust-item.h" #include "rust-keyword-values.h" namespace Rust { @@ -81,6 +82,15 @@ ASTValidation::visit (AST::ExternalFunctionItem &item) AST::ContextualASTVisitor::visit (item); } +void +ASTValidation::visit (AST::Union &item) +{ + if (item.get_variants ().empty ()) + rust_error_at (item.get_locus (), "unions cannot have zero fields"); + + AST::ContextualASTVisitor::visit (item); +} + void ASTValidation::visit (AST::Function &function) { diff --git a/gcc/rust/checks/errors/rust-ast-validation.h b/gcc/rust/checks/errors/rust-ast-validation.h index 49133ee0c3d..1052168ea72 100644 --- a/gcc/rust/checks/errors/rust-ast-validation.h +++ b/gcc/rust/checks/errors/rust-ast-validation.h @@ -21,6 +21,7 @@ #include "rust-ast-visitor.h" #include "rust-ast-full.h" +#include "rust-item.h" namespace Rust { @@ -37,6 +38,7 @@ public: virtual void visit (AST::Lifetime &lifetime); virtual void visit (AST::LoopLabel &label); virtual void visit (AST::ExternalFunctionItem &item); + virtual void visit (AST::Union &item); virtual void visit (AST::Function &function); virtual void visit (AST::Trait &trait); }; diff --git a/gcc/testsuite/rust/compile/const_generics_8.rs b/gcc/testsuite/rust/compile/const_generics_8.rs index c7810830f46..bb34652b9a6 100644 --- a/gcc/testsuite/rust/compile/const_generics_8.rs +++ b/gcc/testsuite/rust/compile/const_generics_8.rs @@ -8,7 +8,12 @@ enum Bidoule<const N: i32 = 15> {} type Bipboupe<const N: i32 = 15> = Bidule; trait Fooable<const N: i32 = 15> {} -union Bidoulepe<const N: i32 = 15> {} // { dg-error "default values for const generic parameters are not allowed in .union. items" } +union Bidoulepe<const N: i32 = 15> { + // { dg-error "default values for const generic parameters are not allowed in .union. items" "" {target *-*-* } .-1 } + int: i32, + float: f32, +} + fn const_default<const N: i32 = 15>() {} // { dg-error "default values for const generic parameters are not allowed in .function. items" } // Note - missing generic parameter - needs name resolution on const generics diff --git a/gcc/testsuite/rust/compile/empty_union.rs b/gcc/testsuite/rust/compile/empty_union.rs new file mode 100644 index 00000000000..6114df5d9c0 --- /dev/null +++ b/gcc/testsuite/rust/compile/empty_union.rs @@ -0,0 +1,2 @@ +#[repr(C)] +union MyUnion {} // { dg-error "unions cannot have zero fields" }