From patchwork Tue Jan 30 12:07:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892899 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=hwI0eMz7; 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 4TPPvq09HFz23gZ for ; Tue, 30 Jan 2024 23:42:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C60C13876073 for ; Tue, 30 Jan 2024 12:42:44 +0000 (GMT) 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 D6138385771E for ; Tue, 30 Jan 2024 12:11:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6138385771E 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 D6138385771E 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=1706616770; cv=none; b=vMFgAAGiDY3pryt9HVhSNNVQUVjgKRjEhPH28E2DlSdjmVfhFo4CodkadKsf360pDn3IZJ4Y8FC+VzofMMtn9NSis2nczk7PWGjmjg8W0EkKmpUh7hRo6jaaSsu+P+FuKpf5q/oWoQy5dUcBXLDYgaBYBRVJq+lYmublfa548hg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616770; c=relaxed/simple; bh=W/eNrUTjA9yGL3yIuT3HJ0iuzdEsJnSvG6ddDA2QAzo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rjIWi+aqGwegXtejbVSzs0gA7bmmSPau9/NUd8cijXZLjjTBn4EiOvUw+ATFtXJSTZ1tUCES8h9+HEYAU97br/F3NzgmMXegpNqx6ojk0jNMD3cLJ239OuGqJ5yaqLrmlVQ69j5vFgFM7FA7NJbKP/cg18RBK3j59Mu+ddkKric= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-33ae38df9d2so2196141f8f.3 for ; Tue, 30 Jan 2024 04:11:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616716; x=1707221516; 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=lOmWXrEA7rElFzwR7/qpv7vdpn7q7q1coKah38tLd50=; b=hwI0eMz7tC7cZbTruWW6foRUkrnffJwjtVJFQ7KixEGIKYz3IAsUb3thc98k3jpxRH +Nvhyy2rbLrqhxFuN9jUum4m80wAVwJQjnL+AKAbIKsTE5D2YVYkyqTc7+82gqpse9sQ fkIk+XO67AJLOhrDL140fSPZr8CVvPIR/SK3eo/SMPqAgBX4fKEpOwEaOY+hpQCV92y9 +wyZM2hYvB3voOrrIeNZ9mYizN0+mwEXCO28YCQsO+MvdthSCmBapaWFnAnZQQ0Bdo92 bZ5vSU9MVms36RBZOcoswMo+1qA9hYlc9+W8lT/8qKWNgZ1vxIgejyogJRIfoAy90VWS Ntnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616716; x=1707221516; 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=lOmWXrEA7rElFzwR7/qpv7vdpn7q7q1coKah38tLd50=; b=cUaH+G7gtIgCYuknKYJ9a3Xoiufp6LTAqpHyGv3vss5qIkKvNW8NtAekIRBDTCTj2Y lsZOZGeeNMtBB2/u+/Vc6Mm42ifsTi9aNdtJjgIQKjk9Z1040890/GwfMB9SjVgaxiry eGQOjqYXa3qY6UfJGdbIwN0qtUVRtPcC4reKszkJq3L1qaEJFV2vHR7MFLBSbb6D42tK W1E8yB2FzgpjuZHddaBP8+LjUKWPpAuW2W2coZvb/hhXoh2wRAQJ1TiDYh2/BNqcdzpN F4Bue+IMch5ldiUOut4pOO4wTsQUHaTtcqCluUXEbuoSSE4wj5D1LsmJsYCaLAHuutG3 IbLA== X-Gm-Message-State: AOJu0YzjYE+bqfG1k4+4WkC3HyqSTG9pV4kctnEm3i5AkvkSpukI6mCo 9qgVWujGNUW/2PyMpx2rx9HGi3GK2WmuBThJ21hEbYmmfS7pWBuVdJEXFkMCOiX3uoXInCzlbex PBQ== X-Google-Smtp-Source: AGHT+IG533/rLKuFTHF16k/MolaCMej/lCOJu9WgF9WbQjXyaxAnIdZELjmGN0BPH6TxxSisIGozGA== X-Received: by 2002:a5d:6b12:0:b0:339:3a25:6d70 with SMTP id v18-20020a5d6b12000000b003393a256d70mr5802163wrw.66.1706616716165; Tue, 30 Jan 2024 04:11:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:55 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Robert Goss Subject: [COMMITTED 092/101] gccrs: Add improved error when a field is redefined in a struct constructor Date: Tue, 30 Jan 2024 13:07:48 +0100 Message-ID: <20240130121026.807464-95-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=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 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: Robert Goss Fixes #2381 If a struct type is initialized with one of it's fields repeated it will currently issue an error at the use site. However we would like to give the rust error code and (like rustc) show both the specifications for the field to help the user diagnose the issue. We move the check after the index for the field has been established so we can look up if the field has already been defined and get it's location. We update the visit method to return if it has handled an error otherwise we then output a second fatal error as not all the field in the specification have been processed. gcc/rust/ChangeLog: * typecheck/rust-hir-type-check-struct-field.h: Allow visit to return a bool * typecheck/rust-hir-type-check-struct.cc: Improve check of repeat fields gcc/testsuite/ChangeLog: * rust/compile/repeated_constructor_fields.rs: Added case with constructor field repeated Signed-off-by: Robert Goss --- .../rust-hir-type-check-struct-field.h | 6 +- .../typecheck/rust-hir-type-check-struct.cc | 90 +++++++++++++------ .../compile/repeated_constructor_fields.rs | 10 +++ 3 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 gcc/testsuite/rust/compile/repeated_constructor_fields.rs diff --git a/gcc/rust/typecheck/rust-hir-type-check-struct-field.h b/gcc/rust/typecheck/rust-hir-type-check-struct-field.h index 923c7077f28..31d2896d0bb 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-struct-field.h +++ b/gcc/rust/typecheck/rust-hir-type-check-struct-field.h @@ -35,9 +35,9 @@ public: protected: void resolve (HIR::StructExprStructFields &struct_expr); - void visit (HIR::StructExprFieldIdentifierValue &field); - void visit (HIR::StructExprFieldIndexValue &field); - void visit (HIR::StructExprFieldIdentifier &field); + bool visit (HIR::StructExprFieldIdentifierValue &field); + bool visit (HIR::StructExprFieldIndexValue &field); + bool visit (HIR::StructExprFieldIdentifier &field); private: TypeCheckStructExpr (HIR::Expr *e); diff --git a/gcc/rust/typecheck/rust-hir-type-check-struct.cc b/gcc/rust/typecheck/rust-hir-type-check-struct.cc index f2dd8b6aa6e..56aa3d869a4 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-struct.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-struct.cc @@ -102,19 +102,26 @@ TypeCheckStructExpr::resolve (HIR::StructExprStructFields &struct_expr) switch (field->get_kind ()) { case HIR::StructExprField::StructExprFieldKind::IDENTIFIER: - visit (static_cast (*field.get ())); + ok = visit ( + static_cast (*field.get ())); break; case HIR::StructExprField::StructExprFieldKind::IDENTIFIER_VALUE: - visit ( + ok = visit ( static_cast (*field.get ())); break; case HIR::StructExprField::StructExprFieldKind::INDEX_VALUE: - visit (static_cast (*field.get ())); + ok = visit ( + static_cast (*field.get ())); break; } + if (!ok) + { + return; + } + if (resolved_field_value_expr == nullptr) { rust_fatal_error (field->get_locus (), @@ -238,16 +245,9 @@ TypeCheckStructExpr::resolve (HIR::StructExprStructFields &struct_expr) resolved = struct_def; } -void +bool TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifierValue &field) { - auto it = fields_assigned.find (field.field_name.as_string ()); - if (it != fields_assigned.end ()) - { - rust_fatal_error (field.get_locus (), "used more than once"); - return; - } - size_t field_index; TyTy::StructFieldType *field_type; bool ok = variant->lookup_field (field.field_name.as_string (), &field_type, @@ -255,7 +255,20 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifierValue &field) if (!ok) { rust_error_at (field.get_locus (), "unknown field"); - return; + return true; + } + + auto it = adtFieldIndexToField.find (field_index); + if (it != adtFieldIndexToField.end ()) + { + rich_location repeat_location (line_table, field.get_locus ()); + auto prev_field_locus = it->second->get_locus (); + repeat_location.add_range (prev_field_locus); + + rust_error_at (repeat_location, ErrorCode::E0062, + "field %<%s%> specified more than once", + field.field_name.as_string ().c_str ()); + return false; } TyTy::BaseType *value = TypeCheckExpr::Resolve (field.get_value ().get ()); @@ -273,18 +286,14 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifierValue &field) fields_assigned.insert (field.field_name.as_string ()); adtFieldIndexToField[field_index] = &field; } + + return true; } -void +bool TypeCheckStructExpr::visit (HIR::StructExprFieldIndexValue &field) { std::string field_name (std::to_string (field.get_tuple_index ())); - auto it = fields_assigned.find (field_name); - if (it != fields_assigned.end ()) - { - rust_fatal_error (field.get_locus (), "used more than once"); - return; - } size_t field_index; TyTy::StructFieldType *field_type; @@ -292,7 +301,20 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIndexValue &field) if (!ok) { rust_error_at (field.get_locus (), "unknown field"); - return; + return true; + } + + auto it = adtFieldIndexToField.find (field_index); + if (it != adtFieldIndexToField.end ()) + { + rich_location repeat_location (line_table, field.get_locus ()); + auto prev_field_locus = it->second->get_locus (); + repeat_location.add_range (prev_field_locus); + + rust_error_at (repeat_location, ErrorCode::E0062, + "field %<%s%> specified more than once", + field_name.c_str ()); + return false; } TyTy::BaseType *value = TypeCheckExpr::Resolve (field.get_value ().get ()); @@ -310,18 +332,13 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIndexValue &field) fields_assigned.insert (field_name); adtFieldIndexToField[field_index] = &field; } + + return true; } -void +bool TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifier &field) { - auto it = fields_assigned.find (field.get_field_name ().as_string ()); - if (it != fields_assigned.end ()) - { - rust_fatal_error (field.get_locus (), "used more than once"); - return; - } - size_t field_index; TyTy::StructFieldType *field_type; bool ok = variant->lookup_field (field.get_field_name ().as_string (), @@ -329,7 +346,20 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifier &field) if (!ok) { rust_error_at (field.get_locus (), "unknown field"); - return; + return true; + } + + auto it = adtFieldIndexToField.find (field_index); + if (it != adtFieldIndexToField.end ()) + { + rich_location repeat_location (line_table, field.get_locus ()); + auto prev_field_locus = it->second->get_locus (); + repeat_location.add_range (prev_field_locus); + + rust_error_at (repeat_location, ErrorCode::E0062, + "field %<%s%> specified more than once", + field.get_field_name ().as_string ().c_str ()); + return false; } // we can make the field look like a path expr to take advantage of existing @@ -358,6 +388,8 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifier &field) fields_assigned.insert (field.get_field_name ().as_string ()); adtFieldIndexToField[field_index] = &field; } + + return true; } } // namespace Resolver diff --git a/gcc/testsuite/rust/compile/repeated_constructor_fields.rs b/gcc/testsuite/rust/compile/repeated_constructor_fields.rs new file mode 100644 index 00000000000..729001b6e3c --- /dev/null +++ b/gcc/testsuite/rust/compile/repeated_constructor_fields.rs @@ -0,0 +1,10 @@ +struct Foo { + x: i32, +} + +fn main() { + let x = Foo { + x: 0, + x: 0, // { dg-error "field 'x' specified more than once" } + }; +}