Skip to content

Commit 321ed3d

CountBleck CountBleck

authored

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

1 parent 0ede7ff commit 321ed3dCopy full SHA for 321ed3d

File tree

9 files changed

+36

-9

lines changed

src
- resolver.ts
- types.ts
tests/compiler
- bindings
- features
  - reference-types.debug.wat
- field-reference-types.json
- field-reference-types.ts

9 files changed

+36

-9

lines changed

`‎src/resolver.ts‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3407,6 +3407,14 @@ export class Resolver extends DiagnosticEmitter {`
`3407`	`3407`	`if (boundInstance) {`
`3408`	`3408`	`let fieldType = boundInstance.type;`
`3409`	`3409`	`if (fieldType == Type.void) break; // failed to resolve earlier`
	`3410`	`+ if (fieldType.isExternalReference) {`
	`3411`	`+ this.error(`
	`3412`	`+ DiagnosticCode.Not_implemented_0,`
	`3413`	`+ assert(boundPrototype.typeNode).range,`
	`3414`	`+ "Reference typed fields"`
	`3415`	`+ );`
	`3416`	`+ break;`
	`3417`	`+ }`
`3410`	`3418`	`let needsLayout = true;`
`3411`	`3419`	`if (base) {`
`3412`	`3420`	`let existingMember = base.getMember(boundPrototype.name);`

`‎src/types.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ export class Type {`
`638`	`638`	`: signatureReference.toString(validWat);`
`639`	`639`	`} else {`
`640`	`640`	`return this.isNullableReference`
`641`		- ? `${this.kindToString()}${nullablePostfix}}`
	`641`	+ ? `${this.kindToString()}${nullablePostfix}`
`642`	`642`	`: this.kindToString();`
`643`	`643`	`}`
`644`	`644`	`}`

`‎tests/compiler/bindings/esm.debug.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ async function instantiate(module, imports = {}) {`
`23`	`23`	`return Math.log(x);`
`24`	`24`	`},`
`25`	`25`	`"globalThis.globalThis": (`
`26`		`- // bindings/esm/immutableGlobalNested: ref_extern \| null}`
	`26`	`+ // bindings/esm/immutableGlobalNested: ref_extern \| null`
`27`	`27`	`globalThis.globalThis`
`28`	`28`	`),`
`29`	`29`	`"Date.getTimezoneOffset"() {`

`‎tests/compiler/bindings/esm.release.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ async function instantiate(module, imports = {}) {`
`23`	`23`	`return Math.log(x);`
`24`	`24`	`},`
`25`	`25`	`"globalThis.globalThis": (`
`26`		`- // bindings/esm/immutableGlobalNested: ref_extern \| null}`
	`26`	`+ // bindings/esm/immutableGlobalNested: ref_extern \| null`
`27`	`27`	`globalThis.globalThis`
`28`	`28`	`),`
`29`	`29`	`"Date.getTimezoneOffset"() {`

`‎tests/compiler/bindings/raw.debug.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export async function instantiate(module, imports = {}) {`
`23`	`23`	`return Math.log(x);`
`24`	`24`	`},`
`25`	`25`	`"globalThis.globalThis": (`
`26`		`- // bindings/esm/immutableGlobalNested: ref_extern \| null}`
	`26`	`+ // bindings/esm/immutableGlobalNested: ref_extern \| null`
`27`	`27`	`globalThis.globalThis`
`28`	`28`	`),`
`29`	`29`	`"Date.getTimezoneOffset"() {`

`‎tests/compiler/bindings/raw.release.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export async function instantiate(module, imports = {}) {`
`23`	`23`	`return Math.log(x);`
`24`	`24`	`},`
`25`	`25`	`"globalThis.globalThis": (`
`26`		`- // bindings/esm/immutableGlobalNested: ref_extern \| null}`
	`26`	`+ // bindings/esm/immutableGlobalNested: ref_extern \| null`
`27`	`27`	`globalThis.globalThis`
`28`	`28`	`),`
`29`	`29`	`"Date.getTimezoneOffset"() {`

`‎tests/compiler/features/reference-types.debug.wat‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`(export "nonNullReal" (global $features/reference-types/nonNullReal))`
`36`	`36`	`(export "memory" (memory 0ドル))`
`37`	`37`	`(start $~start)`
`38`		`- (func $features/reference-types/testLocal<ref_func\|null}>`
	`38`	`+ (func $features/reference-types/testLocal<ref_func\|null>`
`39`	`39`	`(local $local funcref)`
`40`	`40`	`ref.null nofunc`
`41`	`41`	`local.set $local`
`@@ -68,7 +68,7 @@`
`68`	`68`	`unreachable`
`69`	`69`	`end`
`70`	`70`	`)`
`71`		`- (func $features/reference-types/testLocal<ref_extern\|null}>`
	`71`	`+ (func $features/reference-types/testLocal<ref_extern\|null>`
`72`	`72`	`(local $local externref)`
`73`	`73`	`ref.null noextern`
`74`	`74`	`local.set $local`
`@@ -256,8 +256,8 @@`
`256`	`256`	`call $~lib/builtins/abort`
`257`	`257`	`unreachable`
`258`	`258`	`end`
`259`		`- call $features/reference-types/testLocal<ref_func\|null}>`
`260`		`- call $features/reference-types/testLocal<ref_extern\|null}>`
	`259`	`+ call $features/reference-types/testLocal<ref_func\|null>`
	`260`	`+ call $features/reference-types/testLocal<ref_extern\|null>`
`261`	`261`	`ref.func $features/reference-types/someFunc`
`262`	`262`	`global.set $features/reference-types/funcGlobal`
`263`	`263`	`global.get $features/reference-types/funcGlobal`

`‎tests/compiler/field-reference-types.json‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	`+{`
	`2`	`+ "stderr": [`
	`3`	`+ "Not implemented: Reference typed fields",`
	`4`	`+ "Not implemented: Reference typed fields",`
	`5`	`+ "EOF"`
	`6`	`+ ]`
	`7`	`+}`

`‎tests/compiler/field-reference-types.ts‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,12 @@`
	`1`	`+class Foo {`
	`2`	`+ bar: externref = null;`
	`3`	`+}`
	`4`	`+`
	`5`	`+class Baz<T> {`
	`6`	`+ qux: T;`
	`7`	`+}`
	`8`	`+`
	`9`	`+new Foo();`
	`10`	`+new Baz<externref>();`
	`11`	`+`
	`12`	`+ERROR("EOF");`

0 commit comments

Comments

(0)