From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 4E0E83858417 for ; Wed, 7 Feb 2024 12:44:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E0E83858417 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4E0E83858417 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309863; cv=none; b=glzS+HUlVOtLSLwMrNtfmHlUe2vAzFNka1ho4q4T/QatwWKU7nLas9CXGOggkoDTdxA5rVzM13OKoQahOSWKfP7DL2NbGnDoDSw2UwoOFlxqL/gkRgmLFr83p1DxeCYnGvkcmZdMdrqaabyO4JMY8EsUGP6bVTyqF7rgcjA4MQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309863; c=relaxed/simple; bh=ppmQGMf5cSqwXh8+CjzRQKocSVijK0/FRHgD/uQ02C4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=nkqcPfFSBCmw69v0x2I5G7xLxzy9ie1F6/oxnVxrr42GVDFs3oBSNNyovpBszwSt6N4/DEmzSArj6Au8x1ZFxRKJz1ZCO54mX4dBfFdozuzFNOL+2tk48S3pl5j+gaITLRO7T5uOjUqX08Uqdgd1TQwdKOxB7oYqnKtnrRReZcY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4101da33362so1751315e9.3 for ; Wed, 07 Feb 2024 04:44:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309853; x=1707914653; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=JTPWczjXRLl4YXHpDiGew11D6mj2E3TIj9ZOPf8yTgE=; b=FuUa0Ksfze9DyxLeiE9FZKCad9jk0md0BwVUzll/q0pl7RnzZdtOjOuLu3qibrns4V py9VayR6SJZ5//jC5lWoIgkbu+gOKxrxdBHcIo+N21InAUJIMWIXIkqW6TLzGTXp7EFP 8NqnuGRrmt1MSUBoh88CQX3Bpgoh5U+8FqwzbrXU0Z7f7iYTsv9fC0qG5XZQaoV2LfLO 7bJm/84wAPsgX0I/NtkjxUBo0gRSJByUhdDfm6RZjaIla/JjDSBx03dCcZUULk+aiVbS YKKsrFVVKxFQyVsdpa1n+GGfOgVnk4WR5WQEFGMrx2tgTMjkJ1ZU9BHKtoI47Q3wT6wx v/1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309853; x=1707914653; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JTPWczjXRLl4YXHpDiGew11D6mj2E3TIj9ZOPf8yTgE=; b=ThwVZEsfYg8qYJ9vuOGikAG/D4bV590W0Jt0R4jdZlHETCdPVCFMJg3V7yIF/QLfnm FxDO1dvV5JJi61qlFDV9hX/2WCet2opXO8ud/k8l3iSlPSO1ISeEPNSWU2KOYXU/KkQi 1viFc3kfjys6cfr47zhW4xhX6RnB9H0+268jXCKIP6G9ei0SXShoVjUg7PUZHgjzfMmV PefKPvLTyuVt0hBIBWsyDG+S6XnSDMOYJF3sA37v/aCmDIiSIb0ylBLnarLBrErTpB1J WooJIQWo9jdBxyuRtrLxQpuFfsIqylVOkqktrbA9sGMHIzEDLbGWj/PDwNMdXca6SJ+P qVPA== X-Gm-Message-State: AOJu0YzCrDGPAuc+FmV94Tsmej3CENrOsWgR/j/D1ltvvY1XuXZ8dPMz bRowRstHtexRqETZFLck4h44A+RZxwvV1V7RTDxEcONjZlOMAkD+kEbPusI8ng== X-Google-Smtp-Source: AGHT+IEaEyVH+YFpKqrMGRxBiExSbSru+F72NaKx1PtsJPjOPUWyHf8OZCvLMWZtdBggG8ueV/XVMA== X-Received: by 2002:a05:600c:a39c:b0:40f:b283:bb00 with SMTP id hn28-20020a05600ca39c00b0040fb283bb00mr3887786wmb.18.1707309853174; Wed, 07 Feb 2024 04:44:13 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXqxTdA9p3SyW8f5HdJKNd9y5NVIDqVnVbmGzUssTCk0zc0+2x/47oS5pjRGtw4KuLpaB5pzlURBp/ihRLfcsjO992HExrfTk/qcDjf Received: from platypus.sou.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id x19-20020a05600c2a5300b0040fbdd6f69bsm5044188wme.33.2024.02.07.04.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:44:12 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED 15/25] gccrs: refactor inference variable computation into a seperate method Date: Wed, 7 Feb 2024 12:44:01 +0100 Message-ID: <20240207114419.1100894-16-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240207114419.1100894-2-arthur.cohen@embecosm.com> References: <20240207114419.1100894-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Philip Herron gcc/rust/ChangeLog: * typecheck/rust-hir-type-check.cc (TypeResolution::Resolve): refactor * typecheck/rust-hir-type-check.h: new prototype * typecheck/rust-typecheck-context.cc (TypeCheckContext::compute_inference_variables): x --- gcc/rust/typecheck/rust-hir-type-check.cc | 34 +--------------- gcc/rust/typecheck/rust-hir-type-check.h | 2 + gcc/rust/typecheck/rust-typecheck-context.cc | 41 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check.cc b/gcc/rust/typecheck/rust-hir-type-check.cc index 2b7868685d4..0bc72d3f73f 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.cc +++ b/gcc/rust/typecheck/rust-hir-type-check.cc @@ -76,40 +76,8 @@ TypeResolution::Resolve (HIR::Crate &crate) if (saw_errors ()) return; - auto mappings = Analysis::Mappings::get (); auto context = TypeCheckContext::get (); - - // default inference variables if possible - context->iterate ([&] (HirId id, TyTy::BaseType *ty) mutable -> bool { - // nothing to do - if (ty->get_kind () != TyTy::TypeKind::INFER) - return true; - - TyTy::InferType *infer_var = static_cast (ty); - TyTy::BaseType *default_type; - bool ok = infer_var->default_type (&default_type); - if (!ok) - { - rust_error_at (mappings->lookup_location (id), ErrorCode::E0282, - "type annotations needed"); - return true; - } - else - { - auto result - = unify_site (id, TyTy::TyWithLocation (ty), - TyTy::TyWithLocation (default_type), UNDEF_LOCATION); - rust_assert (result); - rust_assert (result->get_kind () != TyTy::TypeKind::ERROR); - result->set_ref (id); - context->insert_type ( - Analysis::NodeMapping (mappings->get_current_crate (), 0, id, - UNKNOWN_LOCAL_DEFID), - result); - } - - return true; - }); + context->compute_inference_variables (true); } // rust-hir-trait-ref.h diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h index 3d66e29052f..52c84fc4435 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.h +++ b/gcc/rust/typecheck/rust-hir-type-check.h @@ -231,6 +231,8 @@ public: WARN_UNUSED_RESULT std::vector regions_from_generic_args (const HIR::GenericArgs &args) const; + void compute_inference_variables (bool error); + private: TypeCheckContext (); diff --git a/gcc/rust/typecheck/rust-typecheck-context.cc b/gcc/rust/typecheck/rust-typecheck-context.cc index 1f4a5a35626..9059e0261b3 100644 --- a/gcc/rust/typecheck/rust-typecheck-context.cc +++ b/gcc/rust/typecheck/rust-typecheck-context.cc @@ -17,6 +17,7 @@ // . #include "rust-hir-type-check.h" +#include "rust-type-util.h" namespace Rust { namespace Resolver { @@ -576,6 +577,46 @@ TypeCheckContext::regions_from_generic_args (const HIR::GenericArgs &args) const return regions; } +void +TypeCheckContext::compute_inference_variables (bool error) +{ + auto mappings = Analysis::Mappings::get (); + + // default inference variables if possible + iterate ([&] (HirId id, TyTy::BaseType *ty) mutable -> bool { + // nothing to do + if (ty->get_kind () != TyTy::TypeKind::INFER) + return true; + + TyTy::InferType *infer_var = static_cast (ty); + TyTy::BaseType *default_type; + + rust_debug_loc (mappings->lookup_location (id), + "trying to default infer-var: %s", + infer_var->as_string ().c_str ()); + bool ok = infer_var->default_type (&default_type); + if (!ok) + { + if (error) + rust_error_at (mappings->lookup_location (id), ErrorCode::E0282, + "type annotations needed"); + return true; + } + + auto result + = unify_site (id, TyTy::TyWithLocation (ty), + TyTy::TyWithLocation (default_type), UNDEF_LOCATION); + rust_assert (result); + rust_assert (result->get_kind () != TyTy::TypeKind::ERROR); + result->set_ref (id); + insert_type (Analysis::NodeMapping (mappings->get_current_crate (), 0, id, + UNKNOWN_LOCAL_DEFID), + result); + + return true; + }); +} + // TypeCheckContextItem TypeCheckContextItem::Item::Item (HIR::Function *item) : item (item) {} -- 2.42.1