Skip to content

type intersection fix for #21243 and #21250 #21295

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
merged 2 commits into from
Apr 6, 2017
Merged

type intersection fix for #21243 and #21250 #21295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f52fe0
enable some type intersection tests that now work
JeffBezanson Apr 6, 2017
c3ced45
fix #21243 and #21250, sigill due to incorrect empty type intersection
JeffBezanson Apr 6, 2017
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
4 changes: 4 additions & 0 deletions src/julia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,10 @@ typedef struct _jl_gcframe_t {
void *__gc_stkf[] = {(void*)11, jl_pgcstack, arg1, arg2, arg3, arg4, arg5}; \
jl_pgcstack = (jl_gcframe_t*)__gc_stkf;

#define JL_GC_PUSH6(arg1, arg2, arg3, arg4, arg5, arg6) \
void *__gc_stkf[] = {(void*)13, jl_pgcstack, arg1, arg2, arg3, arg4, arg5, arg6}; \
jl_pgcstack = (jl_gcframe_t*)__gc_stkf;

#define JL_GC_PUSHARGS(rts_var,n) \
rts_var = ((jl_value_t**)alloca(((n)+2)*sizeof(jl_value_t*)))+2; \
((void**)rts_var)[-2] = (void*)(((size_t)(n))<<1); \
Expand Down
79 changes: 55 additions & 24 deletions src/subtype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ typedef struct _varbinding {
// when this variable's integer value is compared to that of another,
// it equals `other + offset`. used by vararg length parameters.
int offset;
// array of typevars that our bounds depend on, whose UnionAlls need to be
// moved outside ours.
jl_array_t *innervars;
struct _varbinding *prev;
} jl_varbinding_t;

Expand Down Expand Up @@ -132,14 +135,15 @@ static void save_env(jl_stenv_t *e, jl_value_t **root, jl_savedenv_t *se)
len++;
v = v->prev;
}
*root = (jl_value_t*)jl_alloc_svec(len*2);
*root = (jl_value_t*)jl_alloc_svec(len*3);
se->buf = (int8_t*)(len ? malloc(len*2) : NULL);
int i=0; v = e->vars;
int i=0, j=0; v = e->vars;
while (v != NULL) {
jl_svecset(*root, i, v->lb); se->buf[i] = v->occurs_inv;
i++;
jl_svecset(*root, i, v->ub); se->buf[i] = v->occurs_cov;
i++;
jl_svecset(*root, i++, v->lb);
jl_svecset(*root, i++, v->ub);
jl_svecset(*root, i++, (jl_value_t*)v->innervars);
se->buf[j++] = v->occurs_inv;
se->buf[j++] = v->occurs_cov;
v = v->prev;
}
se->rdepth = e->Runions.depth;
Expand All @@ -148,14 +152,16 @@ static void save_env(jl_stenv_t *e, jl_value_t **root, jl_savedenv_t *se)
static void restore_env(jl_stenv_t *e, jl_value_t *root, jl_savedenv_t *se)
{
jl_varbinding_t *v = e->vars;
int i = 0;
int i = 0, j = 0;
while (v != NULL) {
if (root) v->lb = jl_svecref(root, i);
v->occurs_inv = se->buf[i];
i++;
if (root) v->ub = jl_svecref(root, i);
v->occurs_cov = se->buf[i];
i++;
if (root) v->innervars = (jl_array_t*)jl_svecref(root, i);
i++;
v->occurs_inv = se->buf[j++];
v->occurs_cov = se->buf[j++];
v = v->prev;
}
e->Runions.depth = se->rdepth;
Expand Down Expand Up @@ -457,7 +463,7 @@ static int subtype_unionall(jl_value_t *t, jl_unionall_t *u, jl_stenv_t *e, int8
}
btemp = btemp->prev;
}
jl_varbinding_t vb = { u->var, u->var->lb, u->var->ub, R, NULL, 0, 0, 0, 0, e->invdepth, 0, e->vars };
jl_varbinding_t vb = { u->var, u->var->lb, u->var->ub, R, NULL, 0, 0, 0, 0, e->invdepth, 0, NULL, e->vars };
JL_GC_PUSH3(&u, &vb.lb, &vb.ub);
e->vars = &vb;
int ans;
Expand Down Expand Up @@ -1275,8 +1281,9 @@ static int var_occurs_inside(jl_value_t *v, jl_tvar_t *var, int inside, int want
// Caller might not have rooted `res`
static jl_value_t *finish_unionall(jl_value_t *res, jl_varbinding_t *vb, jl_stenv_t *e)
{
jl_value_t *varval = NULL, *root = NULL;
JL_GC_PUSH2(&res, &root);
jl_value_t *varval = NULL;
jl_tvar_t *newvar = vb->var;
JL_GC_PUSH2(&res, &newvar);
// try to reduce var to a single value
if (obviously_egal(vb->lb, vb->ub)) {
// given x<:T<:x, substitute x for T
Expand All @@ -1287,8 +1294,12 @@ static jl_value_t *finish_unionall(jl_value_t *res, jl_varbinding_t *vb, jl_sten
varval = vb->ub;
}

if (!varval && (vb->lb != vb->var->lb || vb->ub != vb->var->ub))
newvar = jl_new_typevar(vb->var->name, vb->lb, vb->ub);

// remove/replace/rewrap free occurrences of this var in the environment
jl_varbinding_t *btemp = e->vars;
int wrap = 1;
while (btemp != NULL) {
if (jl_has_typevar(btemp->lb, vb->var)) {
if (vb->lb == (jl_value_t*)btemp->var) {
Expand All @@ -1299,6 +1310,21 @@ static jl_value_t *finish_unionall(jl_value_t *res, jl_varbinding_t *vb, jl_sten
btemp->lb = jl_substitute_var(btemp->lb, vb->var, varval);
else if (btemp->lb == (jl_value_t*)vb->var)
btemp->lb = vb->lb;
else if (btemp->depth0 == vb->depth0 && !jl_has_typevar(vb->lb, btemp->var) &&
!jl_has_typevar(vb->ub, btemp->var) && jl_has_typevar(btemp->ub, vb->var)) {
// if our variable is T, and some outer variable has constraint S = Ref{T},
// move the `where T` outside `where S` instead of putting it here. issue #21243.
if (btemp->innervars == NULL)
btemp->innervars = jl_alloc_array_1d(jl_array_any_type, 0);
if (newvar != vb->var) {
btemp->lb = jl_substitute_var(btemp->lb, vb->var, (jl_value_t*)newvar);
btemp->ub = jl_substitute_var(btemp->ub, vb->var, (jl_value_t*)newvar);
}
jl_array_ptr_1d_push(btemp->innervars, (jl_value_t*)newvar);
wrap = 0;
btemp = btemp->prev;
continue;
}
else
btemp->lb = jl_new_struct(jl_unionall_type, vb->var, btemp->lb);
assert((jl_value_t*)btemp->var != btemp->lb);
Expand All @@ -1321,26 +1347,31 @@ static jl_value_t *finish_unionall(jl_value_t *res, jl_varbinding_t *vb, jl_sten

// if `v` still occurs, re-wrap body in `UnionAll v` or eliminate the UnionAll
if (jl_has_typevar(res, vb->var)) {
res = jl_new_struct(jl_unionall_type, vb->var, res);
if (varval) {
JL_TRY {
// you can construct `T{x} where x` even if T's parameter is actually
// limited. in that case we might get an invalid instantiation here.
res = jl_instantiate_unionall((jl_unionall_t*)res, varval);
res = jl_substitute_var(res, vb->var, varval);
}
JL_CATCH {
res = jl_bottom_type;
}
}
else {
if (vb->lb != vb->var->lb || vb->ub != vb->var->ub) {
varval = root = (jl_value_t*)jl_new_typevar(vb->var->name, vb->lb, vb->ub);
res = jl_instantiate_unionall((jl_unionall_t*)res, root);
res = jl_new_struct(jl_unionall_type, (jl_tvar_t*)root, res);
}
else {
varval = (jl_value_t*)vb->var;
}
if (newvar != vb->var)
res = jl_substitute_var(res, vb->var, (jl_value_t*)newvar);
varval = (jl_value_t*)newvar;
if (wrap)
res = jl_new_struct(jl_unionall_type, (jl_tvar_t*)newvar, res);
}
}

if (res != jl_bottom_type && vb->innervars != NULL) {
int i;
for(i=0; i < jl_array_len(vb->innervars); i++) {
jl_tvar_t *var = (jl_tvar_t*)jl_arrayref(vb->innervars, i);
if (jl_has_typevar(res, var))
res = jl_new_struct(jl_unionall_type, (jl_tvar_t*)var, res);
}
}

Expand Down Expand Up @@ -1418,8 +1449,8 @@ static jl_value_t *intersect_unionall(jl_value_t *t, jl_unionall_t *u, jl_stenv_
{
jl_value_t *res=NULL, *res2=NULL, *save=NULL, *save2=NULL;
jl_savedenv_t se, se2;
jl_varbinding_t vb = { u->var, u->var->lb, u->var->ub, R, NULL, 0, 0, 0, 0, e->invdepth, 0, e->vars };
JL_GC_PUSH5(&res, &save2, &vb.lb, &vb.ub, &save);
jl_varbinding_t vb = { u->var, u->var->lb, u->var->ub, R, NULL, 0, 0, 0, 0, e->invdepth, 0, NULL, e->vars };
JL_GC_PUSH6(&res, &save2, &vb.lb, &vb.ub, &save, &vb.innervars);
save_env(e, &save, &se);
res = intersect_unionall_(t, u, e, R, param, &vb);
if (res != jl_bottom_type) {
Expand Down
18 changes: 11 additions & 7 deletions test/subtype.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,14 +827,13 @@ function test_intersection()
Tuple{Array{Ref{T}, 1}, Array{Pair{M, T}, 1}, SS} where T where M where SS,
Union{})

# TODO: these test cases currently hang
@test_skip typeintersect(Tuple{Array{Ref{T}, 1}, Array{Pair{M, V}, 1}, Int} where V where T where M,
Tuple{Array{Ref{T}, 1}, Array{Pair{M, T}, 1}, Any} where T where M) ==
Tuple{Array{Ref{T}, 1}, Array{Pair{M, T}, 1}, Int}
@testintersect(Tuple{Array{Ref{T}, 1}, Array{Pair{M, V}, 1}, Int} where V where T where M,
Tuple{Array{Ref{T}, 1}, Array{Pair{M, T}, 1}, Any} where T where M,
Tuple{Array{Ref{T}, 1}, Array{Pair{M, T}, 1}, Int} where T where M)

@test_skip typeintersect(Tuple{Int, Ref{Pair{K,V}}} where V where K,
Tuple{Any, Ref{Pair{T,T}} where T }) ==
Tuple{Int, Ref{Pair{T,T}} where T }
@testintersect(Tuple{Int, Ref{Pair{K,V}}} where V where K,
Tuple{Any, Ref{Pair{T,T}} where T },
Tuple{Int, Ref{Pair{T,T}} where T })

@test_broken isequal_type(_type_intersect(Tuple{T,T} where T,
Union{Tuple{S,Array{Int64,1}},Tuple{S,Array{S,1}}} where S),
Expand Down Expand Up @@ -899,6 +898,11 @@ function test_intersection()
Tuple{Type{T}, T} where T,
Tuple{Type{SIQ20671{T,mS,kgS,sS,AS,KS,molS,cdS,radS,srS}},
SIQ20671{T,mS,kgS,sS,AS,KS,molS,cdS,radS,srS}} where {T,mS,kgS,sS,AS,KS,molS,cdS,radS,srS})

# issue #21243
@testintersect(Tuple{Ref{Ref{T}} where T, Ref},
Tuple{Ref{T}, Ref{T}} where T,
Tuple{Ref{Ref{T}}, Ref{Ref{T}}} where T)
end

function test_intersection_properties()
Expand Down