Skip to content
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

Jump to bottom

Do not cache the type before we finish constructing it. #11606

Merged
merged 2 commits into from
Jun 9, 2015
Merged

Do not cache the type before we finish constructing it. #11606

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a833691
Do not cache the type before we finish constructing it.
yuyichao Jun 6, 2015
e67f5a3
Try fixing the CI failure by adding stack lookup.
yuyichao Jun 9, 2015
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
51 changes: 30 additions & 21 deletions src/jltypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,6 +1951,26 @@ static jl_value_t *inst_type_w_(jl_value_t *t, jl_value_t **env, size_t n,
static jl_svec_t *inst_all(jl_svec_t *p, jl_value_t **env, size_t n,
jl_typestack_t *stack, int check);

static jl_value_t*
lookup_type_stack(jl_typestack_t *stack, jl_datatype_t *tt, size_t ntp,
jl_value_t **iparams)
{
// if an identical instantiation is already in process somewhere
// up the stack, return it. this computes a fixed point for
// recursive types.
jl_typename_t *tn = tt->name;
while (stack != NULL) {
if (stack->tt->name == tn &&
ntp == jl_svec_len(stack->tt->parameters) &&
typekey_eq(stack->tt, iparams, ntp)) {
jl_value_t *lkup = (jl_value_t*)stack->tt;
return lkup == tn->primary ? NULL : lkup;
}
stack = stack->prev;
}
return NULL;
}

static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **iparams, size_t ntp,
int cacheable, int isabstract, jl_typestack_t *stack,
jl_value_t **env, size_t n)
Expand All @@ -1965,6 +1985,10 @@ static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **i
if (lkup != NULL)
return lkup;
}
jl_value_t *stack_lkup = lookup_type_stack(stack, dt, ntp, iparams);
if (stack_lkup) {
return stack_lkup;
}

// always use original type constructor
if (!istuple) {
Expand Down Expand Up @@ -2008,8 +2032,6 @@ static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **i
ndt->size = 0;
ndt->alignment = 1;

if (cacheable) jl_cache_type_(ndt);

if (istuple)
ndt->super = jl_any_type;
else
Expand Down Expand Up @@ -2047,6 +2069,10 @@ static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **i
ndt->ninitialized = ntp;
else
ndt->ninitialized = dt->ninitialized;

if (cacheable)
jl_cache_type_(ndt);

JL_GC_POP();
return (jl_value_t*)ndt;
}
Expand Down Expand Up @@ -2213,25 +2239,8 @@ static jl_value_t *inst_type_w_(jl_value_t *t, jl_value_t **env, size_t n,
// if t's parameters are not bound in the environment, return it uncopied (#9378)
if (!bound && t == tc) { JL_GC_POP(); return (jl_value_t*)t; }

// if an identical instantiation is already in process somewhere
// up the stack, return it. this computes a fixed point for
// recursive types.
jl_typestack_t *tmp = stack;
jl_value_t *lkup = NULL;
while (tmp != NULL) {
if (tmp->tt->name==tn && ntp==jl_svec_len(tmp->tt->parameters) &&
typekey_eq(tmp->tt, iparams, ntp)) {
lkup = (jl_value_t*)tmp->tt;
break;
}
tmp = tmp->prev;
}
if (lkup != NULL && lkup != (jl_value_t*)tc) {
JL_GC_POP();
return lkup;
}
jl_value_t *result = inst_datatype((jl_datatype_t*)tt, NULL, iparams, ntp, cacheable, isabstract,
stack, env, n);
jl_value_t *result = inst_datatype(tt, NULL, iparams, ntp, cacheable,
isabstract, stack, env, n);
JL_GC_POP();
return result;
}
Expand Down