Fix trampolines not inheriting contextual type arguments

src/compiler.ts

@@ -4236,6 +4236,7 @@ export class Compiler extends DiagnosticEmitter {
     trampolineSignature.requiredParameters = maxArguments + 1;
     trampoline = new Function(original.prototype, trampolineName, trampolineSignature, original.memberOf);
     trampoline.flags = original.flags;
+    trampoline.contextualTypeArguments = original.contextualTypeArguments;
     trampoline.set(CommonFlags.COMPILED);
     original.trampoline = trampoline;
 

tests/compiler/function-types.optimized.wat

@@ -5,6 +5,7 @@
  (type $III (func (param i64 i64) (result i64)))
  (type $FFF (func (param f64 f64) (result f64)))
  (type $iiii (func (param i32 i32 i32) (result i32)))
+ (type $iiiii (func (param i32 i32 i32 i32) (result i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
@@ -56,7 +57,27 @@
    (call $function-types/makeAdder<i32>)
   )
  )
- (func $start (; 9 ;) (type $v)
+ (func $function-types/makeAndAdd<i32>|trampoline (; 9 ;) (type $iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (block $N=1
+   (block $N=0
+    (block $N=invalid
+     (br_table $N=0 $N=1 $N=invalid
+      (get_local $3)
+     )
+    )
+    (unreachable)
+   )
+   (set_local $2
+    (call $function-types/makeAdder<i32>)
+   )
+  )
+  (call $function-types/doAddWithFn<i32>
+   (get_local $0)
+   (get_local $1)
+   (get_local $2)
+  )
+ )
+ (func $start (; 10 ;) (type $v)
   (set_global $function-types/i32Adder
    (call $function-types/makeAdder<i32>)
   )
@@ -176,5 +197,25 @@
     (unreachable)
    )
   )
+  (if
+   (i32.ne
+    (call $function-types/makeAndAdd<i32>|trampoline
+     (i32.const 1)
+     (i32.const 2)
+     (i32.const 0)
+     (i32.const 0)
+    )
+    (i32.const 3)
+   )
+   (block
+    (call $abort
+     (i32.const 0)
+     (i32.const 4)
+     (i32.const 41)
+     (i32.const 0)
+    )
+    (unreachable)
+   )
+  )
  )
 )

tests/compiler/function-types.ts

@@ -33,3 +33,9 @@ function addI32(a: i32, b: i32): i32 {
 }
 
 assert(doAddWithFn<i32>(4, 5, addI32) == 9);
+
+function makeAndAdd<T>(a: T, b: T, adder: Adder<T> = makeAdder<T>()): T {
+  return adder(a, b);
+}
+
+assert(makeAndAdd<i32>(1, 2) == 3);

tests/compiler/function-types.untouched.wat

@@ -5,6 +5,7 @@
  (type $III (func (param i64 i64) (result i64)))
  (type $FFF (func (param f64 f64) (result f64)))
  (type $iiii (func (param i32 i32 i32) (result i32)))
+ (type $iiiii (func (param i32 i32 i32 i32) (result i32)))
  (type $v (func))
  (import "env" "abort" (func $abort (param i32 i32 i32 i32)))
  (global $function-types/i32Adder (mut i32) (i32.const 0))
@@ -81,7 +82,36 @@
    )
   )
  )
- (func $start (; 10 ;) (type $v)
+ (func $function-types/makeAndAdd<i32> (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (return
+   (call_indirect (type $iii)
+    (get_local $0)
+    (get_local $1)
+    (get_local $2)
+   )
+  )
+ )
+ (func $function-types/makeAndAdd<i32>|trampoline (; 11 ;) (type $iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (block $N=1
+   (block $N=0
+    (block $N=invalid
+     (br_table $N=0 $N=1 $N=invalid
+      (get_local $3)
+     )
+    )
+    (unreachable)
+   )
+   (set_local $2
+    (call $function-types/makeAdder<i32>)
+   )
+  )
+  (call $function-types/makeAndAdd<i32>
+   (get_local $0)
+   (get_local $1)
+   (get_local $2)
+  )
+ )
+ (func $start (; 12 ;) (type $v)
   (nop)
   (set_global $function-types/i32Adder
    (call $function-types/makeAdder<i32>)
@@ -214,5 +244,27 @@
     (unreachable)
    )
   )
+  (if
+   (i32.eqz
+    (i32.eq
+     (call $function-types/makeAndAdd<i32>|trampoline
+      (i32.const 1)
+      (i32.const 2)
+      (i32.const 0)
+      (i32.const 0)
+     )
+     (i32.const 3)
+    )
+   )
+   (block
+    (call $abort
+     (i32.const 0)
+     (i32.const 4)
+     (i32.const 41)
+     (i32.const 0)
+    )
+    (unreachable)
+   )
+  )
  )
 )