fix: Error on usage of reference types in fields (AssemblyScript#2733)

Changqing-JING · Aug 13, 2023 · 321ed3d · 321ed3d
1 parent 0ede7ff
commit 321ed3d
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 9 deletions.
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -3407,6 +3407,14 @@ export class Resolver extends DiagnosticEmitter {
               if (boundInstance) {
                 let fieldType = boundInstance.type;
                 if (fieldType == Type.void) break; // failed to resolve earlier
+                if (fieldType.isExternalReference) {
+                  this.error(
+                    DiagnosticCode.Not_implemented_0,
+                    assert(boundPrototype.typeNode).range,
+                    "Reference typed fields"
+                  );
+                  break;
+                }
                 let needsLayout = true;
                 if (base) {
                   let existingMember = base.getMember(boundPrototype.name);

diff --git a/src/types.ts b/src/types.ts
@@ -638,7 +638,7 @@ export class Type {
             : signatureReference.toString(validWat);
         } else {
           return this.isNullableReference
-            ? `${this.kindToString()}${nullablePostfix}}`
+            ? `${this.kindToString()}${nullablePostfix}`
             : this.kindToString();
         }
       }

diff --git a/tests/compiler/bindings/esm.debug.js b/tests/compiler/bindings/esm.debug.js
@@ -23,7 +23,7 @@ async function instantiate(module, imports = {}) {
         return Math.log(x);
       },
       "globalThis.globalThis": (
-        // bindings/esm/immutableGlobalNested: ref_extern | null}
+        // bindings/esm/immutableGlobalNested: ref_extern | null
         globalThis.globalThis
       ),
       "Date.getTimezoneOffset"() {

diff --git a/tests/compiler/bindings/esm.release.js b/tests/compiler/bindings/esm.release.js
@@ -23,7 +23,7 @@ async function instantiate(module, imports = {}) {
         return Math.log(x);
       },
       "globalThis.globalThis": (
-        // bindings/esm/immutableGlobalNested: ref_extern | null}
+        // bindings/esm/immutableGlobalNested: ref_extern | null
         globalThis.globalThis
       ),
       "Date.getTimezoneOffset"() {

diff --git a/tests/compiler/bindings/raw.debug.js b/tests/compiler/bindings/raw.debug.js
@@ -23,7 +23,7 @@ export async function instantiate(module, imports = {}) {
         return Math.log(x);
       },
       "globalThis.globalThis": (
-        // bindings/esm/immutableGlobalNested: ref_extern | null}
+        // bindings/esm/immutableGlobalNested: ref_extern | null
         globalThis.globalThis
       ),
       "Date.getTimezoneOffset"() {

diff --git a/tests/compiler/bindings/raw.release.js b/tests/compiler/bindings/raw.release.js
@@ -23,7 +23,7 @@ export async function instantiate(module, imports = {}) {
         return Math.log(x);
       },
       "globalThis.globalThis": (
-        // bindings/esm/immutableGlobalNested: ref_extern | null}
+        // bindings/esm/immutableGlobalNested: ref_extern | null
         globalThis.globalThis
       ),
       "Date.getTimezoneOffset"() {

diff --git a/tests/compiler/features/reference-types.debug.wat b/tests/compiler/features/reference-types.debug.wat
@@ -35,7 +35,7 @@
  (export "nonNullReal" (global $features/reference-types/nonNullReal))
  (export "memory" (memory $0))
  (start $~start)
- (func $features/reference-types/testLocal<ref_func|null}>
+ (func $features/reference-types/testLocal<ref_func|null>
   (local $local funcref)
   ref.null nofunc
   local.set $local
@@ -68,7 +68,7 @@
    unreachable
   end
  )
- (func $features/reference-types/testLocal<ref_extern|null}>
+ (func $features/reference-types/testLocal<ref_extern|null>
   (local $local externref)
   ref.null noextern
   local.set $local
@@ -256,8 +256,8 @@
    call $~lib/builtins/abort
    unreachable
   end
-  call $features/reference-types/testLocal<ref_func|null}>
-  call $features/reference-types/testLocal<ref_extern|null}>
+  call $features/reference-types/testLocal<ref_func|null>
+  call $features/reference-types/testLocal<ref_extern|null>
   ref.func $features/reference-types/someFunc
   global.set $features/reference-types/funcGlobal
   global.get $features/reference-types/funcGlobal

diff --git a/tests/compiler/field-reference-types.json b/tests/compiler/field-reference-types.json
@@ -0,0 +1,7 @@
+{
+  "stderr": [
+    "Not implemented: Reference typed fields",
+    "Not implemented: Reference typed fields",
+    "EOF"
+  ]
+}
diff --git a/tests/compiler/field-reference-types.ts b/tests/compiler/field-reference-types.ts
@@ -0,0 +1,12 @@
+class Foo {
+  bar: externref = null;
+}
+
+class Baz<T> {
+  qux: T;
+}
+
+new Foo();
+new Baz<externref>();
+
+ERROR("EOF");