From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 0FB71385B800; Thu, 12 Jan 2023 07:45:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FB71385B800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673509505; bh=ROlj41XHOkOrM51ndNyi+1dqIL6Qakgj23rLFhMQFfI=; h=From:To:Subject:Date:From; b=MT4g81yzfun0Xmvt52O9UzdUnzCvRLPOa/zzjXeZqQ67Oxhh0es5F1fwuQhownQqL 7A3nlPZ3c6rXymfufImZbMYtkbR6e00nadKZV9aPOfx4C3M3eyGGYiT6OzPyIeEjYd b7jwtYa8Ms++DTKdn9uSX1E8hH4YMkXdDXlpbfqw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Reuse TypeCheckPattern on LetStmt's X-Act-Checkin: gcc X-Git-Author: Owen Avery X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 0152926ab36ba52153f3f457f6f3bb02bb274073 X-Git-Newrev: 97c1308bec6bc149b9295b882b7261ca8f3df048 Message-Id: <20230112074505.0FB71385B800@sourceware.org> Date: Thu, 12 Jan 2023 07:45:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:97c1308bec6bc149b9295b882b7261ca8f3df048 commit 97c1308bec6bc149b9295b882b7261ca8f3df048 Author: Owen Avery Date: Mon Jan 9 19:54:55 2023 -0500 Reuse TypeCheckPattern on LetStmt's Update Rust type-checking to reuse TypeCheckPattern on HIR::LetStmt's. This will unify the paths and improve error handling. Signed-off-by: Owen Avery Diff: --- gcc/rust/typecheck/rust-hir-type-check-stmt.cc | 14 ++++++-------- 1 file 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 890901245ee..673d57cffe8 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 ()));