Support use of static methods as function references (AssemblyScript#721)

jtenner · dcodeIO · commit 3b227d47b1c5 · 2019-07-20T22:30:36.000+02:00
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -7989,9 +7989,26 @@ export class Compiler extends DiagnosticEmitter {
         );
       }
       case ElementKind.FUNCTION_PROTOTYPE: {
+        let prototype = <FunctionPrototype>target;
+
+        if (prototype.is(CommonFlags.STATIC)) {
+          let instance = this.compileFunctionUsingTypeArguments(
+            prototype,
+            [],
+            makeMap<string,Type>(),
+            propertyAccess,
+          );
+          if (instance == null) {
+            return module.unreachable();
+          } else {
+            this.currentType = instance.type;
+            return module.i32(this.ensureFunctionTableEntry(instance));
+          }
+        }
+
         this.error(
           DiagnosticCode.Cannot_access_method_0_without_calling_it_as_it_requires_this_to_be_set,
-          propertyAccess.range, (<FunctionPrototype>target).name
+          propertyAccess.range, prototype.name
         );
         return module.unreachable();
       }
diff --git a/tests/compiler/class-static-function.json b/tests/compiler/class-static-function.json
@@ -0,0 +1,5 @@
+{
+  "asc_flags": [
+    "--runtime none"
+  ]
+}
diff --git a/tests/compiler/class-static-function.optimized.wat b/tests/compiler/class-static-function.optimized.wat
@@ -0,0 +1,34 @@
+(module
+ (type $FUNCSIG$i (func (result i32)))
+ (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
+ (type $FUNCSIG$v (func))
+ (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
+ (memory $0 1)
+ (data (i32.const 8) "0\00\00\00\01\00\00\00\01\00\00\000\00\00\00c\00l\00a\00s\00s\00-\00s\00t\00a\00t\00i\00c\00-\00f\00u\00n\00c\00t\00i\00o\00n\00.\00t\00s")
+ (table $0 2 funcref)
+ (elem (i32.const 0) $null $class-static-function/Example.staticFunc)
+ (global $~lib/argc (mut i32) (i32.const 0))
+ (export "memory" (memory $0))
+ (start $start)
+ (func $class-static-function/Example.staticFunc (; 1 ;) (type $FUNCSIG$i) (result i32)
+  i32.const 42
+ )
+ (func $start (; 2 ;) (type $FUNCSIG$v)
+  i32.const 0
+  global.set $~lib/argc
+  call $class-static-function/Example.staticFunc
+  i32.const 42
+  i32.ne
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 11
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+ )
+ (func $null (; 3 ;) (type $FUNCSIG$v)
+  nop
+ )
+)
diff --git a/tests/compiler/class-static-function.ts b/tests/compiler/class-static-function.ts
@@ -0,0 +1,11 @@
+class Example {
+  public static staticFunc(): i32 {
+    return 42;
+  }
+}
+
+function call(func: () => i32): i32 {
+  return func();
+}
+
+assert(call(Example.staticFunc) == 42);
diff --git a/tests/compiler/class-static-function.untouched.wat b/tests/compiler/class-static-function.untouched.wat
@@ -0,0 +1,43 @@
+(module
+ (type $FUNCSIG$i (func (result i32)))
+ (type $FUNCSIG$ii (func (param i32) (result i32)))
+ (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
+ (type $FUNCSIG$v (func))
+ (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
+ (memory $0 1)
+ (data (i32.const 8) "0\00\00\00\01\00\00\00\01\00\00\000\00\00\00c\00l\00a\00s\00s\00-\00s\00t\00a\00t\00i\00c\00-\00f\00u\00n\00c\00t\00i\00o\00n\00.\00t\00s\00")
+ (table $0 2 funcref)
+ (elem (i32.const 0) $null $class-static-function/Example.staticFunc)
+ (global $~lib/argc (mut i32) (i32.const 0))
+ (export "memory" (memory $0))
+ (start $start)
+ (func $class-static-function/Example.staticFunc (; 1 ;) (type $FUNCSIG$i) (result i32)
+  i32.const 42
+ )
+ (func $class-static-function/call (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  i32.const 0
+  global.set $~lib/argc
+  local.get $0
+  call_indirect (type $FUNCSIG$i)
+ )
+ (func $start:class-static-function (; 3 ;) (type $FUNCSIG$v)
+  i32.const 1
+  call $class-static-function/call
+  i32.const 42
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 11
+   i32.const 0
+   call $~lib/builtins/abort
+   unreachable
+  end
+ )
+ (func $start (; 4 ;) (type $FUNCSIG$v)
+  call $start:class-static-function
+ )
+ (func $null (; 5 ;) (type $FUNCSIG$v)
+ )
+)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "asc_flags": [
 +    "--runtime none"
 +  ]
 +}