Skip to content

Allow more circular type definitions #31828

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

Closed
wants to merge 1 commit into from
Closed

Allow more circular type definitions #31828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/jltypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,7 @@ static jl_value_t *normalize_vararg(jl_value_t *va)
return va;
}

int obviously_egal(jl_value_t *a, jl_value_t *b);
static jl_value_t *inst_datatype_inner(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **iparams, size_t ntp,
int cacheable, jl_typestack_t *stack, jl_typeenv_t *env)
{
Expand All @@ -1088,7 +1089,7 @@ static jl_value_t *inst_datatype_inner(jl_datatype_t *dt, jl_svec_t *p, jl_value
// normalize types equal to wrappers (prepare for wrapper_id)
jl_value_t *tw = extract_wrapper(pi);
if (tw && tw != pi && (tn != jl_type_typename || jl_typeof(pi) == jl_typeof(tw)) &&
jl_types_equal(pi, tw)) {
obviously_egal(pi, tw)) {
iparams[i] = tw;
if (p) jl_gc_wb(p, tw);
}
Expand Down
2 changes: 1 addition & 1 deletion src/subtype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ static void restore_env(jl_stenv_t *e, jl_value_t *root, jl_savedenv_t *se) JL_N
// type utilities

// quickly test that two types are identical
static int obviously_egal(jl_value_t *a, jl_value_t *b)
int obviously_egal(jl_value_t *a, jl_value_t *b)
{
if (a == b) return 1;
if (jl_typeof(a) != jl_typeof(b)) return 0;
Expand Down
8 changes: 8 additions & 0 deletions test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,14 @@ let elT = T22624.body.body.body.types[1].parameters[1]
@test elT2.body.types[1].parameters[1] === elT2
@test Base.isconcretetype(elT2.body.types[1])
end
struct T22624b{A,B,C}; v::Vector{T22624b{Integer,A}}; end
let elT = T22624b.body.body.body.types[1].parameters[1]
@test elT == T22624b{Integer, T22624b.var, C} where C
elT2 = elT.body.types[1].parameters[1]
@test elT2 == T22624b{Integer, Integer, C} where C
@test elT2.body.types[1].parameters[1] === elT2
@test Base.isconcretetype(elT2.body.types[1])
end

# issue #3890
mutable struct A3890{T1}
Expand Down