Skip to content

Commit e81dd5e

Browse files
authored
accumulate environment in forall loop in subtyping (#26691)
fix #26654, fix #26180, fix #25240
1 parent efd6806 commit e81dd5e

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/subtype.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ static int forall_exists_subtype(jl_value_t *x, jl_value_t *y, jl_stenv_t *e, in
10381038
int set = e->Lunions.more;
10391039
if (!sub || !set)
10401040
break;
1041+
save_env(e, &saved, &se);
10411042
for (int i = set; i <= lastset; i++)
10421043
statestack_set(&e->Lunions, i, 0);
10431044
lastset = set - 1;

test/subtype.jl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,3 +1259,17 @@ end
12591259
let (t, e) = intersection_env(Tuple{Union{Int,Int8}}, Tuple{T} where T)
12601260
@test e[1] isa TypeVar
12611261
end
1262+
1263+
# issue #26654
1264+
@test !(Ref{Union{Int64, Ref{Number}}} <: Ref{Union{Ref{T}, T}} where T)
1265+
@test !(Ref{Union{Int64, Val{Number}}} <: Ref{Union{Val{T}, T}} where T)
1266+
@test !(Ref{Union{Ref{Number}, Int64}} <: Ref{Union{Ref{T}, T}} where T)
1267+
@test !(Ref{Union{Val{Number}, Int64}} <: Ref{Union{Val{T}, T}} where T)
1268+
1269+
# issue #26180
1270+
@test !(Ref{Union{Ref{Int64}, Ref{Number}}} <: Ref{Ref{T}} where T)
1271+
@test !(Ref{Union{Ref{Int64}, Ref{Number}}} <: Ref{Union{Ref{T}, Ref{T}}} where T)
1272+
1273+
# issue #25240, #26405
1274+
f26405(::Type{T}) where {T<:Union{Integer, Missing}} = T
1275+
@test f26405(Union{Missing, Int}) == Union{Missing, Int}

0 commit comments

Comments
 (0)