fixed bug with signatures

Author: DuncanUszkay1

src/compiler.ts

@@ -6949,6 +6949,9 @@ export class Compiler extends DiagnosticEmitter {
     // cannot call an instance method without a `this` argument (TODO: `.call`?)
     var thisType = signature.thisType;
     if (hasThis != (thisType != null)) {
+      console.log("signature " + signature)
+      console.log("hasThis " + hasThis)
+      assert(false);
       this.error(
         DiagnosticCode.The_this_types_of_each_signature_are_incompatible,
         reportNode.range
@@ -8289,7 +8292,7 @@ export class Compiler extends DiagnosticEmitter {
         prototype.name,
         prototype,
         null,
-        signature.toClosureSignature(),
+        prototype.hasNestedDefinition ? signature.toClosureSignature() : signature,
         contextualTypeArguments
       );
       if (!this.compileFunction(instance)) return this.module.unreachable();

src/program.ts

@@ -3388,6 +3388,11 @@ export class FunctionPrototype extends DeclaredElement {
            );
   }
 
+  get hasNestedDefinition(): bool {
+    var parent = this.parent;
+    return parent.kind == ElementKind.FUNCTION;
+  }
+
   /** Creates a clone of this prototype that is bound to a concrete class instead. */
   toBound(classInstance: Class): FunctionPrototype {
     assert(this.is(CommonFlags.INSTANCE));

src/resolver.ts

@@ -2781,7 +2781,8 @@ export class Resolver extends DiagnosticEmitter {
     var signature = new Signature(this.program, parameterTypes, returnType, thisType);
     signature.parameterNames = parameterNames;
     signature.requiredParameters = requiredParameters;
-    signature = signature.toClosureSignature();
+
+    signature = prototype.hasNestedDefinition ? signature.toClosureSignature() : signature;
 
     var nameInclTypeParameters = prototype.name;
     if (instanceKey.length) nameInclTypeParameters += "<" + instanceKey + ">";

tests/compiler/extends-recursive.untouched.wat

@@ -159,10 +159,8 @@
   local.get $0
  )
  (func $extends-recursive/Parent#get:child (param $0 i32) (result i32)
-  (local $1 i32)
   local.get $0
   i32.load
-  call $~lib/rt/stub/__retain
  )
  (func $~lib/rt/stub/__release (param $0 i32)
   nop

tests/compiler/implicit-getter-setter.optimized.wat

@@ -2,8 +2,8 @@
  (type $i32_=>_none (func (param i32)))
  (type $i32_i32_=>_none (func (param i32 i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $none_=>_none (func))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
  (type $none_=>_i32 (func (result i32)))
@@ -34,7 +34,7 @@
  (export "Basic#set:val" (func $implicit-getter-setter/Basic#set:val))
  (export "Basic#constructor" (func $implicit-getter-setter/Basic#constructor))
  (export "Managed" (global $implicit-getter-setter/Managed))
- (export "Managed#get:foo" (func $implicit-getter-setter/Managed#get:foo))
+ (export "Managed#get:foo" (func $implicit-getter-setter/Basic#get:val))
  (export "Managed#set:foo" (func $implicit-getter-setter/Managed#set:foo))
  (export "Managed#constructor" (func $implicit-getter-setter/Managed#constructor))
  (func $~lib/rt/tlsf/removeBlock (param $0 i32) (param $1 i32)
@@ -1153,11 +1153,6 @@
   i32.store
   local.get $0
  )
- (func $implicit-getter-setter/Managed#get:foo (param $0 i32) (result i32)
-  local.get $0
-  i32.load
-  call $~lib/rt/pure/__retain
- )
  (func $implicit-getter-setter/Managed#set:foo (param $0 i32) (param $1 i32)
   (local $2 i32)
   local.get $1

tests/compiler/implicit-getter-setter.untouched.wat

@@ -1591,10 +1591,8 @@
   local.get $0
  )
  (func $implicit-getter-setter/Managed#get:foo (param $0 i32) (result i32)
-  (local $1 i32)
   local.get $0
   i32.load
-  call $~lib/rt/pure/__retain
  )
  (func $implicit-getter-setter/Managed#set:foo (param $0 i32) (param $1 i32)
   (local $2 i32)