diff options
author | Philip Herron <herron.philip@googlemail.com> | 2024-02-03 15:18:51 +0000 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-02-07 12:40:23 +0100 |
commit | c91248d1de2f83861a41b5f16d78b198d8a6bb44 (patch) | |
tree | 0d449efae32525b2314971d8d8f983d853151920 /gcc/rust | |
parent | 229f2a709b72da6ea12f2069d567fd9f9bc1891e (diff) | |
download | gcc-c91248d1de2f83861a41b5f16d78b198d8a6bb44.zip gcc-c91248d1de2f83861a41b5f16d78b198d8a6bb44.tar.gz gcc-c91248d1de2f83861a41b5f16d78b198d8a6bb44.tar.bz2 |
gccrs: refactor inference variable computation into a seperate method
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
Diffstat (limited to 'gcc/rust')
-rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check.cc | 34 | ||||
-rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check.h | 2 | ||||
-rw-r--r-- | 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 2b78686..0bc72d3 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<TyTy::InferType *> (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 3d66e29..52c84fc 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<TyTy::Region> 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 1f4a5a3..9059e02 100644 --- a/gcc/rust/typecheck/rust-typecheck-context.cc +++ b/gcc/rust/typecheck/rust-typecheck-context.cc @@ -17,6 +17,7 @@ // <http://www.gnu.org/licenses/>. #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<TyTy::InferType *> (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) {} |