fix(compiler): Fix compilation of functions annotated with alias (#1293)

Author: ospencer

compiler/src/middle_end/linearize.re

@@ -1486,7 +1486,7 @@ let rec transl_anf_statement =
       let (argsty, retty) =
         get_fn_allocation_type(env, desc.tvd_desc.ctyp_type);
       let retty =
-        if (returns_void(desc.tvd_desc.ctyp_type)) {
+        if (returns_void(env, desc.tvd_desc.ctyp_type)) {
           [];
         } else {
           [retty];

compiler/src/typed/ctype.re

@@ -3246,17 +3246,8 @@ let nondep_extension_constructor = (env, id, ext) =>
       switch (args) {
       | TConstrSingleton => ReprValue(WasmI32)
       | TConstrTuple(args) =>
-        ReprFunction(
-          List.map(
-            arg =>
-              Type_utils.wasm_repr_of_allocation_type(
-                Type_utils.get_allocation_type(env, arg),
-              ),
-            args,
-          ),
-          [WasmI32],
-          Indirect,
-        )
+        // All native Grain function args are Managed (i32) types.
+        ReprFunction(List.map(_ => WasmI32, args), [WasmI32], Indirect)
       };
 
     clear_hash();

compiler/src/typed/type_utils.re

@@ -22,7 +22,9 @@ let rec get_fn_allocation_type = (env, ty) => {
       List.map(get_allocation_type(env), args),
       get_allocation_type(env, ret),
     )
-  | TTyConstr(_)
+  | TTyConstr(path, args, _) =>
+    let (ty_args, ty, _) = Env.find_type_expansion(path, env);
+    get_fn_allocation_type(env, Ctype.apply(env, ty_args, ty, args));
   | TTyVar(_)
   | TTyTuple(_)
   | TTyRecord(_)
@@ -61,12 +63,14 @@ let rec is_void = ty => {
   };
 };
 
-let rec returns_void = ty => {
+let rec returns_void = (env, ty) => {
   switch (ty.desc) {
   | TTySubst(linked)
-  | TTyLink(linked) => returns_void(linked)
+  | TTyLink(linked) => returns_void(env, linked)
   | TTyArrow(args, ret, _) => is_void(ret)
-  | TTyConstr(_)
+  | TTyConstr(path, args, _) =>
+    let (ty_args, ty, _) = Env.find_type_expansion(path, env);
+    returns_void(env, Ctype.apply(env, ty_args, ty, args));
   | TTyVar(_)
   | TTyTuple(_)
   | TTyRecord(_)
@@ -92,7 +96,7 @@ let repr_of_type = (env, ty) =>
     let (args, ret) = get_fn_allocation_type(env, ty);
     let args = List.map(wasm_repr_of_allocation_type, args);
     let rets =
-      if (returns_void(ty)) {
+      if (returns_void(env, ty)) {
         [];
       } else {
         [wasm_repr_of_allocation_type(ret)];

compiler/test/suites/types.re

@@ -184,6 +184,24 @@ describe("aliased types", ({test, testSkip}) => {
     |},
     "expression was expected of type %Aliases.Foo = Number",
   );
+  assertRun(
+    "regression_annotated_type_func_1",
+    {|
+      type AddPrinter = (Number, Number) -> Void
+      export let add: AddPrinter = (x, y) => print(x + y)
+      add(4, 4)
+    |},
+    "8\n",
+  );
+  assertRun(
+    "regression_annotated_type_func_2",
+    {|
+      type AddPrinter<a> = (a, a) -> Void
+      export let add: AddPrinter<Number> = (x, y) => print(x + y)
+      add(4, 4)
+    |},
+    "8\n",
+  );
 });
 
 describe("abstract types", ({test}) => {