diff options
| author | Muhammad Mahad <mahadtxt@gmail.com> | 2023-08-16 17:40:09 +0500 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2023-08-17 10:00:47 +0000 |
| commit | 294c5906d7b6e9f7a89e58c334f0072f98b679c6 (patch) | |
| tree | 7c25d54307ecc276d83dbb9413e2855e0dac82be /gcc/rust | |
| parent | b9ae3541a16fef4f60daeee90dbbc7861f1b9584 (diff) | |
| download | gcc-294c5906d7b6e9f7a89e58c334f0072f98b679c6.zip gcc-294c5906d7b6e9f7a89e58c334f0072f98b679c6.tar.gz gcc-294c5906d7b6e9f7a89e58c334f0072f98b679c6.tar.bz2 | |
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 <mahadtxt@gmail.com>
Diffstat (limited to 'gcc/rust')
| -rw-r--r-- | gcc/rust/ast/rust-pattern.h | 7 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-early-name-resolver.cc | 10 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index 63ad0c5..85ab627 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<TupleStructItems> &get_items () - { - rust_assert (has_items ()); - return items; - } + std::unique_ptr<TupleStructItems> &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 e460e6e..b642832 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 df1c205..66641b4 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 ()); |