fix: null expression will infer to Object | null

BREAK_CHANGE Fixes #2662
AssemblyScript · Oct 7, 2023 · 321f9c7 · 321f9c7
1 parent e3e4166
commit 321f9c7
Show file tree

Hide file tree

Showing 10 changed files with 913 additions and 354 deletions.
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -6353,7 +6353,7 @@ export class Compiler extends DiagnosticEmitter {
     // Create a new inline flow and use it to compile the function as a block
     let previousFlow = this.currentFlow;
     let flow = Flow.createInline(previousFlow.targetFunction, instance);
-    let body = [];
+    let body: ExpressionRef[] = [];
 
     if (thisArg) {
       let parent = assert(instance.parent);
@@ -7240,11 +7240,11 @@ export class Compiler extends DiagnosticEmitter {
           }
           return this.makeZero(contextualType);
         }
-        this.currentType = options.usizeType;
-        this.warning(
-          DiagnosticCode.Expression_resolves_to_unusual_type_0,
-          expression.range, this.currentType.toString()
-        );
+        this.currentType = this.program.objectInstance.type.asNullable();
+        // this.warning(
+        //   DiagnosticCode.Expression_resolves_to_unusual_type_0,
+        //   expression.range, this.currentType.toString()
+        // );
         return options.isWasm64
           ? module.i64(0)
           : module.i32(0);

diff --git a/src/resolver.ts b/src/resolver.ts
@@ -1279,7 +1279,7 @@ export class Resolver extends DiagnosticEmitter {
             return ctxType; // TODO: nullable?
           }
         }
-        return this.program.options.usizeType;
+        return this.program.objectInstance.type.asNullable();
       }
     }
     let element = this.lookupIdentifierExpression(node, ctxFlow, ctxElement, reportMode);
@@ -2358,10 +2358,10 @@ export class Resolver extends DiagnosticEmitter {
         let length = expressions.length;
         let elementType = Type.auto;
         let numNullLiterals = 0;
-        for (let i = 0, k = length; i < k; ++i) {
+        for (let i = 0; i < length; ++i) {
           let expression = expressions[i];
           if (expression) {
-            if (expression.kind == NodeKind.Null && length > 1) {
+            if (expression.kind == NodeKind.Null) {
               ++numNullLiterals;
             } else {
               let currentType = this.resolveExpression(expression, ctxFlow, elementType);
@@ -2376,8 +2376,8 @@ export class Resolver extends DiagnosticEmitter {
           }
         }
         if (elementType /* still */ == Type.auto) {
-          if (numNullLiterals == length) { // all nulls infers as usize
-            elementType = this.program.options.usizeType;
+          if (numNullLiterals == length && length > 0) { // all nulls infers as usize
+            elementType = this.program.objectInstance.type.asNullable();
           } else {
             if (reportMode == ReportMode.Report) {
               this.error(

diff --git a/src/types.ts b/src/types.ts
@@ -803,6 +803,13 @@ export class Type {
     TypeFlags.Value,  64
   );
 
+  static readonly nullType32: Type = new Type(TypeKind.Usize,
+    TypeFlags.Unsigned |
+    TypeFlags.Integer  |
+    TypeFlags.Reference|
+    TypeFlags.Value,  32
+  );
+
   /** A 1-bit unsigned integer. */
   static readonly bool: Type = new Type(TypeKind.Bool,
     TypeFlags.Unsigned |