Ty check

crates/analyzer/src/traversal/matching_anomaly.rs

@@ -3,6 +3,7 @@ use std::fmt::Write;
 use fe_common::Span;
 use fe_parser::{ast::MatchArm, node::Node, Label};
 
+use super::pattern_analysis::{PatternMatrix, SimplifiedPattern};
 use crate::{
     context::AnalyzerContext,
     display::Displayable,
@@ -11,8 +12,6 @@ use crate::{
     AnalyzerDb,
 };
 
-use super::pattern_analysis::{PatternMatrix, SimplifiedPattern};
-
 pub(super) fn check_match_exhaustiveness(
     scope: &mut BlockScope,
     arms: &[Node<MatchArm>],

crates/common2/src/diagnostics.rs

@@ -149,6 +149,7 @@ pub enum DiagnosticPass {
     ImplTraitDefinition,
     TraitSatisfaction,
     MethodDefinition,
+    TyCheck,
 
     ExternalAnalysis(ExternalAnalysisKey),
 }
@@ -163,6 +164,7 @@ impl DiagnosticPass {
             Self::ImplTraitDefinition => 5,
             Self::TraitSatisfaction => 6,
             Self::MethodDefinition => 7,
+            Self::TyCheck => 8,
 
             Self::ExternalAnalysis(_) => std::u16::MAX,
         }

crates/driver2/src/diagnostics.rs

@@ -2,12 +2,11 @@ use std::ops::Range;
 
 use camino::Utf8Path;
 use codespan_reporting as cs;
-use cs::{diagnostic as cs_diag, files as cs_files};
-
 use common::{
     diagnostics::{LabelStyle, Severity},
     InputDb, InputFile,
 };
+use cs::{diagnostic as cs_diag, files as cs_files};
 use hir::diagnostics::DiagnosticVoucher;
 
 use crate::{DriverDataBase, DriverDb};

crates/driver2/src/lib.rs

@@ -18,8 +18,8 @@ use hir::{
 use hir_analysis::{
     name_resolution::{DefConflictAnalysisPass, ImportAnalysisPass, PathAnalysisPass},
     ty::{
-        FuncAnalysisPass, ImplAnalysisPass, ImplTraitAnalysisPass, TraitAnalysisPass,
-        TypeAliasAnalysisPass, TypeDefAnalysisPass,
+        BodyAnalysisPass, FuncAnalysisPass, ImplAnalysisPass, ImplTraitAnalysisPass,
+        TraitAnalysisPass, TypeAliasAnalysisPass, TypeDefAnalysisPass,
     },
     HirAnalysisDb,
 };
@@ -154,5 +154,6 @@ fn initialize_analysis_pass(db: &DriverDataBase) -> AnalysisPassManager<'_> {
     pass_manager.add_module_pass(Box::new(ImplAnalysisPass::new(db)));
     pass_manager.add_module_pass(Box::new(ImplTraitAnalysisPass::new(db)));
     pass_manager.add_module_pass(Box::new(FuncAnalysisPass::new(db)));
+    pass_manager.add_module_pass(Box::new(BodyAnalysisPass::new(db)));
     pass_manager
 }

crates/hir-analysis/Cargo.toml

@@ -23,7 +23,9 @@ fe-compiler-test-utils = { path = "../test-utils" }
 num-bigint = "0.4"
 once_cell = "1.18"
 regex = "1.10"
+if_chain = "1.0"
+bitflags = "2.5"
 
 [dev-dependencies]
 codespan-reporting = "0.11"
-dir-test = "0.1"
+dir-test = "0.2"

crates/hir-analysis/src/lib.rs

@@ -2,76 +2,84 @@ use hir::{span::DynLazySpan, HirDb};
 
 #[salsa::jar(db = HirAnalysisDb)]
 pub struct Jar(
-    /// Functions for import/name resolutions.
+    // Functions for import/name resolutions.
     name_resolution::resolve_path_early_impl,
     name_resolution::resolve_imports,
     name_resolution::diagnostics::NameResolutionDiagAccumulator,
     name_resolution::diagnostics::ImportResolutionDiagAccumulator,
-    /// Type system.
+    name_resolution::traits_in_scope::available_traits_in_scope_impl,
+    name_resolution::traits_in_scope::TraitScope,
+    // Type system.
     ty::ty_def::TyId,
     ty::ty_def::ty_kind,
-    ty::ty_def::free_inference_keys,
-    ty::ty_def::collect_type_params,
     ty::ty_def::pretty_print_ty,
-    ty::ty_def::AdtDef,
-    ty::ty_def::FuncDef,
-    ty::ty_def::AdtRefId,
-    /// Const types.
+    ty::ty_def::decompose_ty_app,
+    ty::ty_def::ty_flags,
+    // Adt types.
+    ty::adt_def::AdtDef,
+    ty::adt_def::AdtRefId,
+    ty::adt_def::lower_adt,
+    // Func type.
+    ty::func_def::FuncDef,
+    ty::func_def::lower_func,
+    // Const types.
     ty::const_ty::ConstTyId,
     ty::const_ty::evaluate_const_ty,
-    /// Type lowering.
+    // Type lowering.
     ty::ty_lower::lower_hir_ty,
-    ty::ty_lower::lower_adt,
-    ty::ty_lower::lower_func,
     ty::ty_lower::lower_type_alias,
     ty::ty_lower::collect_generic_params,
     ty::ty_lower::GenericParamOwnerId,
     ty::ty_lower::GenericParamTypeSet,
     ty::ty_lower::evaluate_params_precursor,
-    /// Trait lowering.
+    // Trait lowering.
     ty::trait_lower::lower_trait,
     ty::trait_lower::lower_trait_ref,
     ty::trait_lower::collect_trait_impls,
     ty::trait_lower::lower_impl_trait,
     ty::trait_lower::collect_implementor_methods,
-    /// Method collection.
+    // Method collection.
     ty::method_table::collect_methods,
-    /// Item Definition analysis.
+    ty::method_table::probe_method,
+    // Item Definition analysis.
     ty::def_analysis::check_recursive_adt,
     ty::def_analysis::analyze_adt,
     ty::def_analysis::analyze_type_alias,
     ty::def_analysis::analyze_trait,
     ty::def_analysis::analyze_impl,
     ty::def_analysis::analyze_impl_trait,
     ty::def_analysis::analyze_func,
-    /// Trait system.
+    // Trait system.
     ty::trait_def::TraitDef,
     ty::trait_def::TraitInstId,
     ty::trait_def::Implementor,
     ty::trait_def::ingot_trait_env,
-    ty::trait_def::trait_implementors,
+    ty::trait_def::impls_of_trait,
+    ty::trait_def::impls_of_ty,
+    // Trait constraints
     ty::constraint::collect_super_traits,
     ty::constraint::collect_trait_constraints,
     ty::constraint::collect_adt_constraints,
     ty::constraint::collect_implementor_constraints,
     ty::constraint::collect_impl_block_constraints,
     ty::constraint::collect_func_def_constraints,
-    ty::constraint::super_trait_insts,
-    ty::constraint::compute_super_assumptions,
+    ty::constraint::collect_func_def_constraints_impl,
     ty::constraint::ty_constraints,
-    ty::constraint::trait_inst_constraints,
     ty::constraint::PredicateId,
     ty::constraint::PredicateListId,
     ty::constraint_solver::is_goal_satisfiable,
-    ty::constraint_solver::check_ty_app_sat,
-    ty::constraint_solver::check_trait_inst_sat,
-    /// Diagnostic accumulators.
+    ty::constraint_solver::check_ty_wf,
+    ty::constraint_solver::check_trait_inst_wf,
+    // Type checking.
+    ty::ty_check::check_func_body,
+    // Diagnostic accumulators.
     ty::diagnostics::AdtDefDiagAccumulator,
     ty::diagnostics::TypeAliasDefDiagAccumulator,
     ty::diagnostics::TraitDefDiagAccumulator,
     ty::diagnostics::ImplTraitDefDiagAccumulator,
     ty::diagnostics::ImplDefDiagAccumulator,
     ty::diagnostics::FuncDefDiagAccumulator,
+    ty::diagnostics::FuncBodyDiagAccumulator,
 );
 
 pub trait HirAnalysisDb: salsa::DbWithJar<Jar> + HirDb {

crates/hir-analysis/src/name_resolution/diagnostics.rs

@@ -66,6 +66,14 @@ impl NameResDiag {
         }
     }
 
+    pub(crate) fn invisible(
+        span: DynLazySpan,
+        name: IdentId,
+        invisible_span: Option<DynLazySpan>,
+    ) -> Self {
+        Self::Invisible(span, name, invisible_span)
+    }
+
     pub(super) fn conflict(name: IdentId, conflict_with: Vec<DynLazySpan>) -> Self {
         Self::Conflict(name, conflict_with)
     }
@@ -74,14 +82,6 @@ impl NameResDiag {
         Self::NotFound(span, ident)
     }
 
-    pub(super) fn invisible(
-        span: DynLazySpan,
-        name: IdentId,
-        invisible_span: Option<DynLazySpan>,
-    ) -> Self {
-        Self::Invisible(span, name, invisible_span)
-    }
-
     pub(super) fn ambiguous(
         db: &dyn HirAnalysisDb,
         span: DynLazySpan,