fix JuliaLang#14825

a new type's supertype was not taken into account while instantiating
the types of its fields

(cherry picked from commit 0dd74d5)
ref JuliaLang#14847

src/interpreter.c

@@ -105,6 +105,22 @@ static void check_can_assign_type(jl_binding_t *b)
         jl_errorf("invalid redefinition of constant %s", b->name->name);
 }
 
+void jl_reinstantiate_inner_types(jl_datatype_t *t);
+
+void jl_set_datatype_super(jl_datatype_t *tt, jl_value_t *super)
+{
+    if (!jl_is_datatype(super) || !jl_is_abstracttype(super) ||
+        tt->name == ((jl_datatype_t*)super)->name ||
+        jl_subtype(super,(jl_value_t*)jl_vararg_type,0) ||
+        jl_is_tuple_type(super) ||
+        jl_subtype(super,(jl_value_t*)jl_type_type,0)) {
+        jl_errorf("invalid subtyping in definition of %s",
+                  jl_symbol_name(tt->name->name));
+    }
+    tt->super = (jl_datatype_t*)super;
+    jl_gc_wb(tt, tt->super);
+}
+
 static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ngensym)
 {
     if (jl_is_symbol(e)) {
@@ -354,6 +370,7 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
         jl_gc_wb_binding(b, dt);
         super = eval(args[2], locals, nl, ngensym);
         jl_set_datatype_super(dt, super);
+        jl_reinstantiate_inner_types(dt);
         b->value = temp;
         if (temp==NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
             jl_checked_assignment(b, (jl_value_t*)dt);
@@ -384,6 +401,7 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
         jl_gc_wb_binding(b, dt);
         super = eval(args[3], locals, nl, ngensym);
         jl_set_datatype_super(dt, super);
+        jl_reinstantiate_inner_types(dt);
         b->value = temp;
         if (temp==NULL || !equiv_type(dt, (jl_datatype_t*)temp)) {
             jl_checked_assignment(b, (jl_value_t*)dt);
@@ -413,6 +431,8 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
         jl_gc_wb_binding(b,dt);
 
         JL_TRY {
+            super = eval(args[3], locals, nl, ngensym);
+            jl_set_datatype_super(dt, super);
             // operations that can fail
             inside_typedef = 1;
             dt->types = (jl_svec_t*)eval(args[4], locals, nl, ngensym);
@@ -423,8 +443,7 @@ static jl_value_t *eval(jl_value_t *e, jl_value_t **locals, size_t nl, size_t ng
                 if (!jl_is_type(elt) && !jl_is_typevar(elt))
                     jl_type_error_rt(dt->name->name->name, "type definition", (jl_value_t*)jl_type_type, elt);
             }
-            super = eval(args[3], locals, nl, ngensym);
-            jl_set_datatype_super(dt, super);
+            jl_reinstantiate_inner_types(dt);
         }
         JL_CATCH {
             b->value = temp;

src/jltypes.c

@@ -2346,6 +2346,9 @@ void jl_reinstantiate_inner_types(jl_datatype_t *t)
     top.tt = t;
     top.prev = NULL;
     size_t n = jl_svec_len(t->parameters);
+    if (n == 0) return;
+    t->name->cache = jl_emptysvec;
+    t->name->linearcache = jl_emptysvec;
     jl_value_t **env = (jl_value_t**)alloca(n*2*sizeof(void*));
     for(int i=0; i < n; i++) {
         env[i*2] = jl_svecref(t->parameters,i);

src/julia_internal.h

@@ -108,9 +108,6 @@ int jl_types_equal_generic(jl_value_t *a, jl_value_t *b, int useenv);
 jl_datatype_t *jl_inst_concrete_tupletype_v(jl_value_t **p, size_t np);
 jl_datatype_t *jl_inst_concrete_tupletype(jl_svec_t *p);
 
-void jl_set_datatype_super(jl_datatype_t *tt, jl_value_t *super);
-void jl_add_constructors(jl_datatype_t *t);
-
 jl_value_t *jl_nth_slot_type(jl_tupletype_t *sig, size_t i);
 void jl_compute_field_offsets(jl_datatype_t *st);
 jl_array_t *jl_new_array_for_deserialization(jl_value_t *atype, uint32_t ndims, size_t *dims,

src/toplevel.c

@@ -625,28 +625,6 @@ DLLEXPORT jl_value_t *jl_load_(jl_value_t *str)
     return jl_load(jl_string_data(str), jl_string_len(str));
 }
 
-// type definition ------------------------------------------------------------
-
-void jl_reinstantiate_inner_types(jl_datatype_t *t);
-
-void jl_set_datatype_super(jl_datatype_t *tt, jl_value_t *super)
-{
-    if (!jl_is_datatype(super) || !jl_is_abstracttype(super) ||
-        tt->name == ((jl_datatype_t*)super)->name ||
-        jl_subtype(super,(jl_value_t*)jl_vararg_type,0) ||
-        jl_is_tuple_type(super) ||
-        jl_subtype(super,(jl_value_t*)jl_type_type,0)) {
-        jl_errorf("invalid subtyping in definition of %s",tt->name->name->name);
-    }
-    tt->super = (jl_datatype_t*)super;
-    jl_gc_wb(tt, tt->super);
-    if (jl_svec_len(tt->parameters) > 0) {
-        tt->name->cache = jl_emptysvec;
-        tt->name->linearcache = jl_emptysvec;
-        jl_reinstantiate_inner_types(tt);
-    }
-}
-
 // method definition ----------------------------------------------------------
 
 extern int jl_boot_file_loaded;

test/core.jl

@@ -3488,3 +3488,18 @@ function __f_isa_arg_1()
     length(a)
 end
 @test __f_isa_arg_1() == 1
+
+# issue #14825
+abstract abstest_14825
+
+type t1_14825{A <: abstest_14825, B}
+  x::A
+  y::B
+end
+
+type t2_14825{C, B} <: abstest_14825
+  x::C
+  y::t1_14825{t2_14825{C, B}, B}
+end
+
+@test t2_14825{Int,Int}.types[2] <: t1_14825