From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 44F05388B584; Wed, 8 Jun 2022 12:49:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44F05388B584 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] Remove old hack to handle type inferencing in untyped decalred bindings X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: d09b135116f2bd56fbab054a9a0122cc6b59e06e X-Git-Newrev: d01ae2ab56be6b515a863184baad496c50363fe6 Message-Id: <20220608124954.44F05388B584@sourceware.org> Date: Wed, 8 Jun 2022 12:49:54 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:49:54 -0000 https://gcc.gnu.org/g:d01ae2ab56be6b515a863184baad496c50363fe6 commit d01ae2ab56be6b515a863184baad496c50363fe6 Author: Philip Herron Date: Tue May 24 15:43:53 2022 +0100 Remove old hack to handle type inferencing in untyped decalred bindings In the case where you define let a; with no type to then use this binding and let type inferencing infer the type we used this code to implicitly generate a new type binding to the resolved node id of the the lvalue. This was very dangerous and was always meant to be a stop gap untill we supported more of type inferencing. The issue here was that we were badly overriting a function types within the type-context which hits an ICE in the method resolution code which is expecting function TyTy's within in order to match methods correctly. Fixes #1274 #1273 Diff: --- gcc/rust/typecheck/rust-hir-type-check-expr.h | 41 +-------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.h b/gcc/rust/typecheck/rust-hir-type-check-expr.h index b20a048865d..8145c5a741b 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.h +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.h @@ -384,46 +384,7 @@ public: auto lhs = TypeCheckExpr::Resolve (expr.get_lhs (), false); auto rhs = TypeCheckExpr::Resolve (expr.get_rhs (), false); - auto result = lhs->coerce (rhs); - if (result->get_kind () == TyTy::TypeKind::ERROR) - return; - - // in the case of declare first for an ADT Type: - // - // let a; - // a = Foo{..} - // let b = a.field; - // - // The lhs will have a TyTy of INFER and so when the declaration is - // referenced it will still have an unknown type so we will fail to resolve - // FieldAccessExpr - - NodeId ast_node_id = expr.get_lhs ()->get_mappings ().get_nodeid (); - NodeId ref_node_id; - if (!resolver->lookup_resolved_name (ast_node_id, &ref_node_id)) - return; - - Definition def; - if (!resolver->lookup_definition (ref_node_id, &def)) - { - rust_error_at (expr.get_locus (), - "assignment infer - unknown reference"); - return; - } - - HirId ref; - if (!mappings->lookup_node_to_hir (expr.get_mappings ().get_crate_num (), - def.parent, &ref)) - { - rust_error_at (expr.get_locus (), - "assignment infer - reverse lookup failure"); - return; - } - - context->insert_type ( - Analysis::NodeMapping (expr.get_lhs ()->get_mappings ().get_crate_num (), - ref_node_id, ref, UNKNOWN_LOCAL_DEFID), - result->clone ()); + lhs->coerce (rhs); } void visit (HIR::CompoundAssignmentExpr &expr) override