shithub: mc

Info  •  Files  •  Log  •  Branches

Don't crash when resolving types.

--- a/parse/infer.c

+++ b/parse/infer.c

@@ -231,6 +231,8 @@

     if (t->resolved)

         return;

     t->resolved = 1;

+    if (t->type == Tygeneric)

+        t = tyspecialize(st, t);

     tybind(st, t);

     /* if this is a generic type, bind the params. */

     /* Walk through aggregate type members */

@@ -542,11 +544,6 @@

         b = t;

     }

-    if (a->type == Tygeneric)

-        a = tyspecialize(st, a);

-    if (b->type == Tygeneric)

-        b = tyspecialize(st, b);

-

     r = NULL;

     if (a->type == Tyvar) {

         tytab[a->tid] = b;

@@ -1012,8 +1009,7 @@

     Type *t;

     t = tf(st, decltype(n));

-    if (t->type == Tygeneric) {

-        t = tyspecialize(st, t);

+    if (decltype(n)->type == Tygeneric) {

         unifyparams(st, n, t, decltype(n));

     }

     settype(st, n, t);