From cdddf7baff74af1542788868d1cfab6dc435f2ef Mon Sep 17 00:00:00 2001 From: Muhammad Mahad Date: Wed, 16 Aug 2023 17:40:09 +0500 Subject: gccrs: [E0164] Neither tuple struct nor tuple variant used as a pattern Checking if pattern has items, before returing solves ICE. Added error code and rich location. Also, fixes https://github.com/Rust-GCC/gccrs/issues/2430 gcc/rust/ChangeLog: * ast/rust-pattern.h: No need of assertion, we are handling it. * resolve/rust-early-name-resolver.cc (EarlyNameResolver::visit): Added check which emits error instead of using assertion. * typecheck/rust-hir-type-check-pattern.cc (TypeCheckPattern::visit): Added rich location and error code. gcc/testsuite/ChangeLog: * rust/compile/match5.rs: Updated comment for dejagnu. * rust/compile/pattern-struct.rs: New test for ICE. Signed-off-by: Muhammad Mahad --- gcc/rust/ast/rust-pattern.h | 7 +------ gcc/rust/resolve/rust-early-name-resolver.cc | 10 ++++++++++ gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'gcc/rust') diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index 95655f5..18fe999 100644 --- a/gcc/rust/ast/rust-pattern.h +++ b/gcc/rust/ast/rust-pattern.h @@ -1176,12 +1176,7 @@ public: void accept_vis (ASTVisitor &vis) override; - // TODO: seems kinda dodgy. Think of better way. - std::unique_ptr &get_items () - { - rust_assert (has_items ()); - return items; - } + std::unique_ptr &get_items () { return items; } PathInExpression &get_path () { return path; } const PathInExpression &get_path () const { return path; } diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc index 47d4e1b..5b701f5 100644 --- a/gcc/rust/resolve/rust-early-name-resolver.cc +++ b/gcc/rust/resolve/rust-early-name-resolver.cc @@ -1105,6 +1105,16 @@ EarlyNameResolver::visit (AST::TupleStructItemsRange &tuple_items) void EarlyNameResolver::visit (AST::TupleStructPattern &pattern) { + if (!pattern.has_items ()) + { + rich_location rich_locus (line_table, pattern.get_locus ()); + rich_locus.add_fixit_replace ( + "function calls are not allowed in patterns"); + rust_error_at ( + rich_locus, ErrorCode::E0164, + "expected tuple struct or tuple variant, found associated function"); + return; + } pattern.get_items ()->accept_vis (*this); } diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index 9737045..18e9b34 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -76,14 +76,16 @@ TypeCheckPattern::visit (HIR::TupleStructPattern &pattern) } // error[E0532]: expected tuple struct or tuple variant, found struct variant - // `Foo::D` + // `Foo::D`, E0532 by rustc 1.49.0 , E0164 by rustc 1.71.0 if (variant->get_variant_type () != TyTy::VariantDef::VariantType::TUPLE) { std::string variant_type = TyTy::VariantDef::variant_type_string (variant->get_variant_type ()); + rich_location rich_locus (line_table, pattern.get_locus ()); + rich_locus.add_fixit_replace ("not a tuple struct or tuple variant"); rust_error_at ( - pattern.get_locus (), + rich_locus, ErrorCode::E0164, "expected tuple struct or tuple variant, found %s variant %<%s::%s%>", variant_type.c_str (), adt->get_name ().c_str (), variant->get_identifier ().c_str ()); -- cgit v1.1