Rename anyref to externref to match proposal change

.github/workflows/test.yml

@@ -115,8 +115,7 @@ jobs:
     - uses: dcodeIO/setup-node-nvm@master
       with:
         node-mirror: https://nodejs.org/download/v8-canary/
-        # FIXME: newer node-v8 builds are currently broken
-        node-version: "14.0.0-v8-canary201911242015a12d82"
+        node-version: "v15.0.0-v8-canary202007077c53168ead"
     - name: Install dependencies
       run: npm ci --no-audit
     - name: Clean distribution files

package.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "93.0.0-nightly.20200609",
+    "binaryen": "93.0.0-nightly.20200611",
     "long": "^4.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^6.2.0"

src/builtins.ts

@@ -971,7 +971,7 @@ function builtin_nameof(ctx: BuiltinContext): ExpressionRef {
       if (signatureReference) {
         value = "Function";
       } else {
-        value = "Anyref";
+        value = "Externref";
       }
     }
   } else {
@@ -990,7 +990,7 @@ function builtin_nameof(ctx: BuiltinContext): ExpressionRef {
       case TypeKind.ISIZE: { value = "isize"; break; }
       case TypeKind.USIZE: { value = "usize"; break; }
       case TypeKind.V128: { value = "v128"; break; }
-      case TypeKind.ANYREF: { value = "anyref"; break; }
+      case TypeKind.EXTERNREF: { value = "externref"; break; }
       default: assert(false);
       case TypeKind.VOID: { value = "void"; break; }
     }

src/common.ts

@@ -123,7 +123,7 @@ export namespace CommonNames {
   export const f32 = "f32";
   export const f64 = "f64";
   export const v128 = "v128";
-  export const anyref = "anyref";
+  export const externref = "externref";
   export const i8x16 = "i8x16";
   export const u8x16 = "u8x16";
   export const i16x8 = "i16x8";
@@ -185,7 +185,7 @@ export namespace CommonNames {
   export const F32 = "F32";
   export const F64 = "F64";
   export const V128 = "V128";
-  export const Anyref = "Anyref";
+  export const Externref = "Externref";
   export const String = "String";
   export const Array = "Array";
   export const StaticArray = "StaticArray";

src/compiler.ts

@@ -4375,7 +4375,7 @@ export class Compiler extends DiagnosticEmitter {
             );
             break;
           }
-          case TypeKind.ANYREF: {
+          case TypeKind.EXTERNREF: {
             // TODO: ref.eq
             this.error(
               DiagnosticCode.Not_implemented_0,
@@ -4476,7 +4476,7 @@ export class Compiler extends DiagnosticEmitter {
             );
             break;
           }
-          case TypeKind.ANYREF: {
+          case TypeKind.EXTERNREF: {
             // TODO: !ref.eq
             this.error(
               DiagnosticCode.Not_implemented_0,
@@ -8464,7 +8464,7 @@ export class Compiler extends DiagnosticEmitter {
         );
         if (!functionInstance || !this.compileFunction(functionInstance)) return module.unreachable();
         if (contextualType.is(TypeFlags.HOST | TypeFlags.REFERENCE)) {
-          this.currentType = Type.anyref;
+          this.currentType = Type.externref;
           return module.ref_func(functionInstance.internalName);
         }
         let index = this.ensureFunctionTableEntry(functionInstance);
@@ -10469,7 +10469,7 @@ export class Compiler extends DiagnosticEmitter {
                     typeString = "object";
                   }
                 } else {
-                  typeString = "anyref"; // TODO?
+                  typeString = "externref"; // TODO?
                 }
               }
             } else if (type == Type.bool) {
@@ -10580,7 +10580,7 @@ export class Compiler extends DiagnosticEmitter {
   checkTypeSupported(type: Type, reportNode: Node): bool {
     switch (type.kind) {
       case TypeKind.V128: return this.checkFeatureEnabled(Feature.SIMD, reportNode);
-      case TypeKind.ANYREF: return this.checkFeatureEnabled(Feature.REFERENCE_TYPES, reportNode);
+      case TypeKind.EXTERNREF: return this.checkFeatureEnabled(Feature.REFERENCE_TYPES, reportNode);
     }
     if (type.is(TypeFlags.REFERENCE)) {
       let classReference = type.classReference;
@@ -10653,7 +10653,7 @@ export class Compiler extends DiagnosticEmitter {
       case TypeKind.F32: return module.f32(0);
       case TypeKind.F64: return module.f64(0);
       case TypeKind.V128: return module.v128(v128_zero);
-      case TypeKind.ANYREF: return module.ref_null();
+      case TypeKind.EXTERNREF: return module.ref_null();
     }
   }
 
@@ -10752,7 +10752,7 @@ export class Compiler extends DiagnosticEmitter {
         flow.freeTempLocal(temp);
         return ret;
       }
-      case TypeKind.ANYREF: {
+      case TypeKind.EXTERNREF: {
         // TODO: non-null object might still be considered falseish
         // i.e. a ref to Boolean(false), Number(0), String("") etc.
         return module.unary(UnaryOp.EqzI32, module.ref_is_null(expr));

src/flow.ts

@@ -311,7 +311,7 @@ export class Flow {
       case <u32>NativeType.F32: { temps = parentFunction.tempF32s; break; }
       case <u32>NativeType.F64: { temps = parentFunction.tempF64s; break; }
       case <u32>NativeType.V128: { temps = parentFunction.tempV128s; break; }
-      case <u32>NativeType.Anyref: { temps = parentFunction.tempAnyrefs; break; }
+      case <u32>NativeType.Externref: { temps = parentFunction.tempExternrefs; break; }
       case <u32>NativeType.Exnref: { temps = parentFunction.tempExnrefs; break; }
       default: throw new Error("concrete type expected");
     }
@@ -395,10 +395,10 @@ export class Flow {
         else parentFunction.tempV128s = temps = [];
         break;
       }
-      case <u32>NativeType.Anyref: {
-        let tempAnyrefs = parentFunction.tempAnyrefs;
-        if (tempAnyrefs) temps = tempAnyrefs;
-        else parentFunction.tempAnyrefs = temps = [];
+      case <u32>NativeType.Externref: {
+        let tempExternrefs = parentFunction.tempExternrefs;
+        if (tempExternrefs) temps = tempExternrefs;
+        else parentFunction.tempExternrefs = temps = [];
         break;
       }
       case <u32>NativeType.Exnref: {

src/glue/binaryen.d.ts

@@ -1,6 +1,6 @@
 /**
  * @fileoverview Portable definitions for Binaryen's C-API.
- * 
+ *
  * tsc uses the .js file next to it, while asc makes it a Wasm import.
  *
  * See: https://github.com/WebAssembly/binaryen/blob/master/src/binaryen-c.h
@@ -34,7 +34,7 @@ export declare function _BinaryenTypeFloat32(): BinaryenType;
 export declare function _BinaryenTypeFloat64(): BinaryenType;
 export declare function _BinaryenTypeVec128(): BinaryenType;
 export declare function _BinaryenTypeFuncref(): BinaryenType;
-export declare function _BinaryenTypeAnyref(): BinaryenType;
+export declare function _BinaryenTypeExternref(): BinaryenType;
 export declare function _BinaryenTypeNullref(): BinaryenType;
 export declare function _BinaryenTypeExnref(): BinaryenType;
 export declare function _BinaryenTypeUnreachable(): BinaryenType;

src/module.ts

@@ -38,7 +38,7 @@ export namespace NativeType {
   export const F64: NativeType = 5 /* _BinaryenTypeFloat64 */;
   export const V128: NativeType = 6 /* _BinaryenTypeVec128 */;
   export const Funcref: NativeType = 7 /* _BinaryenTypeFuncref */;
-  export const Anyref: NativeType = 8 /* _BinaryenTypeAnyref */;
+  export const Externref: NativeType = 8 /* _BinaryenTypeExternref */;
   export const Nullref: NativeType = 9 /* _BinaryenTypeNullref */;
   export const Exnref: NativeType = 10 /* _BinaryenTypeExnref */;
   export const Auto: NativeType = -1 /* _BinaryenTypeAuto */;
@@ -1759,8 +1759,8 @@ export class Module {
             // TODO
             return 0;
           }
-          // Not possible to clone an anyref as it is opaque
-          case <u32>NativeType.Anyref: {
+          // Not possible to clone an externref as it is opaque
+          case <u32>NativeType.Externref: {
             return 0;
           }
           default: {

src/program.ts

@@ -905,7 +905,7 @@ export class Program extends DiagnosticEmitter {
     // compiler needs to check this condition whenever such a value is created
     // respectively stored or loaded.
     this.registerNativeType(CommonNames.v128, Type.v128);
-    this.registerNativeType(CommonNames.anyref, Type.anyref);
+    this.registerNativeType(CommonNames.externref, Type.externref);
 
     // register compiler hints
     this.registerConstantInteger(CommonNames.ASC_TARGET, Type.i32,
@@ -1136,7 +1136,7 @@ export class Program extends DiagnosticEmitter {
     this.registerWrapperClass(Type.f32, CommonNames.F32);
     this.registerWrapperClass(Type.f64, CommonNames.F64);
     if (options.hasFeature(Feature.SIMD)) this.registerWrapperClass(Type.v128, CommonNames.V128);
-    if (options.hasFeature(Feature.REFERENCE_TYPES)) this.registerWrapperClass(Type.anyref, CommonNames.Anyref);
+    if (options.hasFeature(Feature.REFERENCE_TYPES)) this.registerWrapperClass(Type.externref, CommonNames.Externref);
 
     // resolve prototypes of extended classes or interfaces
     var resolver = this.resolver;
@@ -3565,7 +3565,7 @@ export class Function extends TypedElement {
   tempF32s: Local[] | null = null;
   tempF64s: Local[] | null = null;
   tempV128s: Local[] | null = null;
-  tempAnyrefs: Local[] | null = null;
+  tempExternrefs: Local[] | null = null;
   tempExnrefs: Local[] | null = null;
 
   // used by flows to keep track of break labels

src/resolver.ts

@@ -1222,7 +1222,7 @@ export class Resolver extends DiagnosticEmitter {
         let classReference = ctxType.classReference;
         return ctxType.is(TypeFlags.REFERENCE) && classReference !== null
           ? classReference.type.asNullable()
-          : this.program.options.usizeType; // TODO: anyref context?
+          : this.program.options.usizeType; // TODO: externref context?
       }
     }
     var element = this.lookupIdentifierExpression(node, ctxFlow, ctxElement, reportMode);
@@ -2301,7 +2301,7 @@ export class Resolver extends DiagnosticEmitter {
         if (
           numNullLiterals > 0 &&
           elementType.is(TypeFlags.REFERENCE) &&
-          !elementType.is(TypeFlags.HOST) // TODO: anyref isn't nullable as-is
+          !elementType.is(TypeFlags.HOST) // TODO: externref isn't nullable as-is
         ) {
           elementType = elementType.asNullable();
         }

src/types.ts

@@ -61,7 +61,7 @@ export const enum TypeKind {
   // references
 
   /** Any host reference. */
-  ANYREF,
+  EXTERNREF,
 
   // other
 
@@ -267,7 +267,7 @@ export class Type {
             if (targetFunction = target.signatureReference) {
               return currentFunction.isAssignableTo(targetFunction);
             }
-          } else if (this.kind == TypeKind.ANYREF && target.kind == TypeKind.ANYREF) {
+          } else if (this.kind == TypeKind.EXTERNREF && target.kind == TypeKind.EXTERNREF) {
             return true;
           }
         }
@@ -344,8 +344,8 @@ export class Type {
           : signatureReference.toString();
       }
       // TODO: Reflect.apply(value, "toString", []) ?
-      assert(this.kind == TypeKind.ANYREF);
-      return "anyref";
+      assert(this.kind == TypeKind.EXTERNREF);
+      return "externref";
     }
     switch (this.kind) {
       case TypeKind.I8: return "i8";
@@ -362,7 +362,7 @@ export class Type {
       case TypeKind.F32: return "f32";
       case TypeKind.F64: return "f64";
       case TypeKind.V128: return "v128";
-      case TypeKind.ANYREF: return "anyref";
+      case TypeKind.EXTERNREF: return "externref";
       default: assert(false);
       case TypeKind.VOID: return "void";
     }
@@ -388,7 +388,7 @@ export class Type {
       case TypeKind.F32: return NativeType.F32;
       case TypeKind.F64: return NativeType.F64;
       case TypeKind.V128: return NativeType.V128;
-      case TypeKind.ANYREF: return NativeType.Anyref;
+      case TypeKind.EXTERNREF: return NativeType.Externref;
       case TypeKind.VOID: return NativeType.None;
     }
   }
@@ -521,7 +521,7 @@ export class Type {
   );
 
   /** Any host reference. */
-  static readonly anyref: Type = new Type(TypeKind.ANYREF,
+  static readonly externref: Type = new Type(TypeKind.EXTERNREF,
     TypeFlags.HOST       |
     TypeFlags.REFERENCE, 0
   );

std/assembly/bindings/Reflect.ts

@@ -1,4 +1,4 @@
-export declare function get(target: anyref, propertyKey: anyref/* , receiver: anyref */): anyref;
-export declare function has(target: anyref, propertyKey: anyref): bool;
-export declare function set(target: anyref, propertyKey: anyref, value: anyref/* , receiver: anyref */): anyref;
-export declare function apply(target: anyref, thisArgument: anyref, argumentsList: anyref): anyref;
+export declare function get(target: externref, propertyKey: externref/* , receiver: externref */): externref;
+export declare function has(target: externref, propertyKey: externref): bool;
+export declare function set(target: externref, propertyKey: externref, value: externref/* , receiver: externref */): externref;
+export declare function apply(target: externref, thisArgument: externref, argumentsList: externref): externref;

std/assembly/bindings/console.ts

@@ -1,10 +1,10 @@
-export declare function assert(value: anyref): void;
+export declare function assert(value: externref): void;
 export declare function clear(): void;
-export declare function error(value: anyref): void;
-export declare function info(value: anyref): void;
-export declare function log(value: anyref): void;
-export declare function time(label: anyref): anyref;
-export declare function timeEnd(label: anyref): void;
-export declare function timeLog(label: anyref): void;
+export declare function error(value: externref): void;
+export declare function info(value: externref): void;
+export declare function log(value: externref): void;
+export declare function time(label: externref): externref;
+export declare function timeEnd(label: externref): void;
+export declare function timeLog(label: externref): void;
 export declare function trace(): void;
-export declare function warn(value: anyref): void;
+export declare function warn(value: externref): void;

std/assembly/index.d.ts

@@ -36,7 +36,7 @@ declare type f64 = number;
 /** A 128-bit vector. */
 declare type v128 = object;
 /** A host reference. */
-declare type anyref = object;
+declare type externref = object;
 
 // Compiler hints
 

std/assembly/reference.ts

@@ -1,4 +1,4 @@
 /** Host reference abstraction. */
 @final @unmanaged
-export abstract class Anyref {
+export abstract class Externref {
 }

tests/compiler/features/reference-types.optimized.wat

@@ -1,25 +1,25 @@
 (module
- (type $anyref_=>_anyref (func (param anyref) (result anyref)))
+ (type $externref_=>_externref (func (param externref) (result externref)))
  (type $none_=>_none (func))
  (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
- (type $anyref_=>_none (func (param anyref)))
- (type $anyref_anyref_=>_i32 (func (param anyref anyref) (result i32)))
- (type $anyref_anyref_=>_anyref (func (param anyref anyref) (result anyref)))
- (import "reference-types" "someObject" (global $features/reference-types/someObject anyref))
- (import "reference-types" "someKey" (global $features/reference-types/someKey anyref))
- (import "Reflect" "has" (func $~lib/bindings/Reflect/has (param anyref anyref) (result i32)))
+ (type $externref_=>_none (func (param externref)))
+ (type $externref_externref_=>_i32 (func (param externref externref) (result i32)))
+ (type $externref_externref_=>_externref (func (param externref externref) (result externref)))
+ (import "reference-types" "someObject" (global $features/reference-types/someObject externref))
+ (import "reference-types" "someKey" (global $features/reference-types/someKey externref))
+ (import "Reflect" "has" (func $~lib/bindings/Reflect/has (param externref externref) (result i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
- (import "console" "log" (func $~lib/bindings/console/log (param anyref)))
- (import "Reflect" "get" (func $~lib/bindings/Reflect/get (param anyref anyref) (result anyref)))
- (import "reference-types" "external" (func $features/reference-types/external (param anyref) (result anyref)))
+ (import "console" "log" (func $~lib/bindings/console/log (param externref)))
+ (import "Reflect" "get" (func $~lib/bindings/Reflect/get (param externref externref) (result externref)))
+ (import "reference-types" "external" (func $features/reference-types/external (param externref) (result externref)))
  (memory $0 1)
  (data (i32.const 1024) "6\00\00\00\01\00\00\00\01\00\00\006\00\00\00f\00e\00a\00t\00u\00r\00e\00s\00/\00r\00e\00f\00e\00r\00e\00n\00c\00e\00-\00t\00y\00p\00e\00s\00.\00t\00s")
- (global $features/reference-types/nullGlobal (mut anyref) (ref.null))
+ (global $features/reference-types/nullGlobal (mut externref) (ref.null))
  (export "memory" (memory $0))
  (export "external" (func $features/reference-types/external))
  (export "internal" (func $features/reference-types/internal))
  (start $~start)
- (func $features/reference-types/internal (param $0 anyref) (result anyref)
+ (func $features/reference-types/internal (param $0 externref) (result externref)
   local.get $0
   call $features/reference-types/external
   call $features/reference-types/external