diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-01-11 11:39:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 11:39:37 +0000 |
| commit | 59cbecb75d3fd270094c2008343bf86f0c3bf80d (patch) | |
| tree | fcd5ab298190296dfc860270859ca8aa7f1a7d23 /gcc | |
| parent | b6fcee808fd654d2d5c13b87565f1e59cc61a138 (diff) | |
| parent | 97c1308bec6bc149b9295b882b7261ca8f3df048 (diff) | |
| download | gcc-59cbecb75d3fd270094c2008343bf86f0c3bf80d.zip gcc-59cbecb75d3fd270094c2008343bf86f0c3bf80d.tar.gz gcc-59cbecb75d3fd270094c2008343bf86f0c3bf80d.tar.bz2 | |
Merge #1730
1730: Improve type checking on let statements r=philberty a=powerboat9
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---
Improves the typechecking of patterns in let statements.
Co-authored-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-stmt.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc index 8909012..673d57c 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc @@ -82,7 +82,7 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt) { infered = TyTy::TupleType::get_unit_type (stmt.get_mappings ().get_hirid ()); - const HIR::Pattern &stmt_pattern = *stmt.get_pattern (); + HIR::Pattern &stmt_pattern = *stmt.get_pattern (); TyTy::BaseType *init_expr_ty = nullptr; Location init_expr_locus; if (stmt.has_init_expr ()) @@ -111,27 +111,25 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt) TyTy::TyWithLocation (specified_ty, specified_ty_locus), TyTy::TyWithLocation (init_expr_ty, init_expr_locus), stmt.get_locus ()); - context->insert_type (stmt_pattern.get_pattern_mappings (), specified_ty); + TypeCheckPattern::Resolve (&stmt_pattern, specified_ty); } else { // let x:i32; if (specified_ty != nullptr) { - context->insert_type (stmt_pattern.get_pattern_mappings (), - specified_ty); + TypeCheckPattern::Resolve (&stmt_pattern, specified_ty); } // let x = 123; else if (init_expr_ty != nullptr) { - context->insert_type (stmt_pattern.get_pattern_mappings (), - init_expr_ty); + TypeCheckPattern::Resolve (&stmt_pattern, init_expr_ty); } // let x; else { - context->insert_type ( - stmt_pattern.get_pattern_mappings (), + TypeCheckPattern::Resolve ( + &stmt_pattern, new TyTy::InferType ( stmt_pattern.get_pattern_mappings ().get_hirid (), TyTy::InferType::InferTypeKind::GENERAL, stmt.get_locus ())); |