Correctly handle PartialTypeVars in inference (#305)

* Fix up _type * Bump patch version * Bump patch version
compintell · Oct 22, 2024 · c58457f · c58457f · willtebbutt · Oct 22, 2024
1 parent 77f8861
commit c58457f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Mooncake"
 uuid = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
 authors = ["Will Tebbutt, Hong Ge, and contributors"]
-version = "0.4.19"
+version = "0.4.20"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

diff --git a/src/interpreter/abstract_interpretation.jl b/src/interpreter/abstract_interpretation.jl
@@ -112,10 +112,11 @@ else
     get_inference_world(interp::CC.AbstractInterpreter) = CC.get_inference_world(interp)
 end
 
-_type(x) = x
+_type(x::Type) = x
 _type(x::CC.Const) = _typeof(x.val)
 _type(x::CC.PartialStruct) = x.typ
 _type(x::CC.Conditional) = Union{_type(x.thentype), _type(x.elsetype)}
+_type(::CC.PartialTypeVar) = TypeVar
 
 struct NoInlineCallInfo <: CC.CallInfo
     info::CC.CallInfo # wrapped call

diff --git a/test/front_matter.jl b/test/front_matter.jl
@@ -71,7 +71,8 @@ using Mooncake:
     verify_rdata_value,
     is_primitive,
     MinimalCtx,
-    stmt
+    stmt,
+    _type
 
 using .TestUtils:
     test_rule,

diff --git a/test/interpreter/abstract_interpretation.jl b/test/interpreter/abstract_interpretation.jl
@@ -67,4 +67,8 @@ contains_primitive_behind_call(x) = @inline contains_primitive(x)
             @test stmt(ad_ir.stmts)[invoke_line].args[2] == GlobalRef(Main, :a_primitive)
         end
     end
+    @testset "_type" begin
+        @test _type(CC.Const(5.0)) === Float64
+        @test _type(CC.PartialTypeVar(TypeVar(:a, Union{}, Any), true, true)) === TypeVar
+    end
 end