Skip to content

Commit

Permalink
add missing root
Browse files Browse the repository at this point in the history
  • Loading branch information
carnaval committed Mar 9, 2014
1 parent 85d13db commit 0e84b09
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/gf.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ static jl_value_t *lookup_match(jl_value_t *a, jl_value_t *b, jl_tuple_t **penv,
jl_value_t *ti = jl_type_intersection_matching(a, b, penv, tvars);
if (ti == (jl_value_t*)jl_bottom_type)
return ti;
JL_GC_PUSH1(&ti);
assert(jl_is_tuple(*penv));
jl_value_t **ee = (jl_value_t**)alloca(sizeof(void*) * jl_tuple_len(*penv));
int n=0;
Expand Down Expand Up @@ -854,8 +855,10 @@ static jl_value_t *lookup_match(jl_value_t *a, jl_value_t *b, jl_tuple_t **penv,
issue #5254
*/
if (val == (jl_value_t*)jl_bottom_type) {
if (!jl_subtype(a, ti, 0))
if (!jl_subtype(a, ti, 0)) {
JL_GC_POP();
return (jl_value_t*)jl_bottom_type;
}
}
}
}
Expand All @@ -865,6 +868,7 @@ static jl_value_t *lookup_match(jl_value_t *a, jl_value_t *b, jl_tuple_t **penv,
memcpy(en->data, ee, n*sizeof(void*));
*penv = en;
}
JL_GC_POP();
return ti;
}

Expand Down

0 comments on commit 0e84b09

Please sign in to comment.