Skip to content

fix(ty): aggregate constraints #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andogq merged 12 commits into from
Jan 11, 2026
Merged

fix(ty): aggregate constraints #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b5a10dd
fix(thir_gen): build `Constraints` to easily add constraints
andogq Jan 7, 2026
07ce9cb
fix(thir): intern `TypeVar`
andogq Jan 8, 2026
6abaac2
fix(disjoint-set): make `DisjointUnionSet` generic
andogq Jan 8, 2026
b80923d
feat(ty): add `TupleMergeAndSubstitute` solution
andogq Jan 8, 2026
0152d2e
fix(mir-gen): catch mismatched function body type
andogq Jan 8, 2026
30c1ca8
fix(solver): use `root.union_sets` more consistently
andogq Jan 8, 2026
b2488a4
fix(solver): remove redundant return boolean
andogq Jan 8, 2026
8e5acc9
fix(solver): combine some merge-and-insert logic
andogq Jan 8, 2026
ca064c9
feat(solver): add `NonConcreteType::Tuple`
andogq Jan 11, 2026
e6ad78d
chore(solver): document constraints
andogq Jan 11, 2026
6274ebc
feat(solver): implement `TypeVar::Field` instead of `Constraint::Field`
andogq Jan 11, 2026
a568aaa
fix(ty): re-organise imports
andogq Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/ir/thir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
use crate::prelude::*;
use crate::{
prelude::*,
ty::{TypeVarId, TypeVars},
};

use hir::*;

#[derive(Clone, Debug)]
pub struct Thir<'hir> {
pub hir: &'hir Hir,
pub types: HashMap<TypeVarId, TypeId>,
pub type_vars: TypeVars,
}

impl Deref for Thir<'_> {
Expand All @@ -17,11 +21,16 @@ impl Deref for Thir<'_> {
}

impl<'hir> Thir<'hir> {
pub fn new(hir: &'hir Hir, types: HashMap<TypeVarId, TypeId>) -> Self {
Self { hir, types }
pub fn new(hir: &'hir Hir, types: HashMap<TypeVarId, TypeId>, type_vars: TypeVars) -> Self {
Self {
hir,
types,
type_vars,
}
}

pub fn type_of(&self, id: impl Into<TypeVarId>) -> TypeId {
self.types[&id.into()]
pub fn type_of(&self, id: impl Into<TypeVar>) -> TypeId {
let var = self.type_vars.get(id.into());
self.types[&var]
}
}
10 changes: 7 additions & 3 deletions src/passes/mir_gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,13 @@ impl<'ctx, 'hir, 'thir> MirGen<'ctx, 'hir, 'thir> {
// If the block resolves to a value of the same type as the return value, then it's an
// implicit return.
let body = &self.thir[function.entry];
if let Some(result) = block.operand
&& self.thir.type_of(body.expression) == function.return_ty
{
if let Some(result) = block.operand {
assert_eq!(
self.thir.type_of(body.expression),
function.return_ty,
"ty check bug: body expression must match function return"
);

let place = self.mir.places.insert(return_local.into());
self.mir.add_statement(
block.exit,
Expand Down
40 changes: 14 additions & 26 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__assign.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,39 @@ expression: "Assign { variable: ExpressionId(0), value: ExpressionId(0) }"
---
[
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Eq(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
),
),
(
Expression(
ExpressionId(
1,
),
TypeVarId(
0,
),
Eq(
Type(
TypeId(
1,
),
TypeVarId(
1,
),
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
]
28 changes: 10 additions & 18 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__deep loop.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,32 @@
---
source: src/passes/thir_gen.rs
expression: pass.constraints
expression: "*pass.constraints"
---
[
(
Expression(
ExpressionId(
4,
),
TypeVarId(
0,
),
Integer(
Any,
),
),
(
Expression(
ExpressionId(
4,
),
TypeVarId(
0,
),
Eq(
Expression(
ExpressionId(
3,
),
TypeVarId(
4,
),
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
5,
),
Aggregate(
[],
0,
),
),
]
40 changes: 14 additions & 26 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__equal.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,38 @@ expression: "Binary { lhs: ExpressionId(0), operation: Equal, rhs: ExpressionId(
---
[
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Eq(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
),
),
(
Expression(
ExpressionId(
1,
),
TypeVarId(
0,
),
Eq(
Type(
TypeId(
4,
),
TypeVarId(
2,
),
),
),
Expand Down
16 changes: 6 additions & 10 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__expression_statement.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
---
source: src/passes/thir_gen.rs
expression: pass.constraints
expression: "*pass.constraints"
---
[
(
Expression(
ExpressionId(
1,
),
TypeVarId(
0,
),
Integer(
Any,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
]
52 changes: 18 additions & 34 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__greater.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,70 +4,54 @@ expression: "Binary { lhs: ExpressionId(0), operation: Greater, rhs: ExpressionI
---
[
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Aggregate(
[],
0,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Eq(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Integer(
Any,
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
4,
),
Integer(
Any,
),
),
(
Expression(
ExpressionId(
1,
),
TypeVarId(
0,
),
Eq(
Type(
TypeId(
4,
),
TypeVarId(
2,
),
),
),
Expand Down
20 changes: 7 additions & 13 deletions src/passes/snapshots/lumina2__passes__thir_gen__test__inferred.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,21 @@ expression: Inferred(ExpressionId(0))
---
[
(
Binding(
BindingId(
0,
),
TypeVarId(
0,
),
Eq(
Expression(
ExpressionId(
0,
),
TypeVarId(
1,
),
),
),
(
Expression(
ExpressionId(
0,
),
TypeVarId(
1,
),
Aggregate(
[],
0,
),
),
]
Loading