Use jl_types_egal in equiv_field_types

Fixes #52686 Fixes timholy/Revise.jl#770
JuliaLang · Jan 4, 2024 · 8a81c69 · 8a81c69
1 parent 5a28cf5
commit 8a81c69
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/builtins.c b/src/builtins.c
@@ -1786,7 +1786,7 @@ static int equiv_field_types(jl_value_t *old, jl_value_t *ft)
         jl_value_t *ta = jl_svecref(old, i);
         jl_value_t *tb = jl_svecref(ft, i);
         if (jl_has_free_typevars(ta)) {
-            if (!jl_has_free_typevars(tb) || !jl_egal(ta, tb))
+            if (!jl_has_free_typevars(tb) || !jl_types_egal(ta, tb))
                 return 0;
         }
         else if (jl_has_free_typevars(tb) || jl_typetagof(ta) != jl_typetagof(tb) ||

diff --git a/test/core.jl b/test/core.jl
@@ -111,6 +111,21 @@ let abcd = ABCDconst(1, 2, 3, 4)
         abcd.d = nothing)
     @test (1, 2, "not constant", 4) === (abcd.a, abcd.b, abcd.c, abcd.d)
 end
+@test begin
+    # Issue #52686
+    mktemp() do f, io
+        write(io, """
+            struct A{T} end
+            struct B{T, S}
+              a::A{<:T}
+            end
+            """)
+        close(io)
+        include(f)
+        include(f)
+    end
+    true
+end
 
 # test `===` handling null pointer in struct #44712
 struct N44712