fix by declaring function table before indirect call analysis

Author: MaxGraey

src/builtins.ts

@@ -3812,6 +3812,7 @@ function builtin_call_indirect(ctx: BuiltinFunctionContext): ExpressionRef {
     paramTypeRefs[i] = compiler.currentType.toRef();
   }
   compiler.currentType = returnType;
+  compiler.ensureFunctionTable();
   return module.call_indirect(null /* TODO */, indexArg, operandExprs, createType(paramTypeRefs), returnType.toRef());
 }
 builtinFunctions.set(BuiltinNames.call_indirect, builtin_call_indirect);

src/compiler.ts

@@ -458,6 +458,8 @@ export class Compiler extends DiagnosticEmitter {
   staticGcObjectOffsets: Map<i32, Set<i32>> = new Map();
   /** Function table being compiled. First elem is blank. */
   functionTable: Function[] = [];
+  /** Whether the default function table has been declared in the module yet. */
+  functionTableDeclared: bool = false;
   /** Arguments length helper global. */
   builtinArgumentsLength: GlobalRef = 0;
   /** Requires runtime features. */
@@ -877,11 +879,12 @@ export class Compiler extends DiagnosticEmitter {
     }
   }
 
-  private initDefaultTable(): void {
+  /** Ensures the default function table is declared so indirect calls can be built and their effects analyzed. */
+  ensureFunctionTable(): void {
+    if (this.functionTableDeclared) return;
+    this.functionTableDeclared = true;
     let options = this.options;
     let module = this.module;
-
-    // import and/or export table if requested (default table is named '0' by Binaryen)
     if (options.importTable) {
       module.addTableImport(
         CommonNames.DefaultTable,
@@ -895,6 +898,19 @@ export class Compiler extends DiagnosticEmitter {
           null
         );
       }
+    } else {
+      module.ensureFunctionTable(CommonNames.DefaultTable);
+    }
+  }
+
+  private initDefaultTable(): void {
+    let options = this.options;
+    let module = this.module;
+
+    // declare the default table now if imported (default table is named '0' by Binaryen).
+    // non-imported tables are declared lazily on first indirect call, see ensureFunctionTable
+    if (options.importTable) {
+      this.ensureFunctionTable();
     }
     if (options.exportTable) {
       module.addTableExport(CommonNames.DefaultTable, ExportNames.Table);
@@ -2152,7 +2168,8 @@ export class Compiler extends DiagnosticEmitter {
     let memorySegment = instance.memorySegment;
     if (!memorySegment) {
 
-      // Add to the function table
+      // Add to the function table, declaring it on first use so effect analysis works
+      this.ensureFunctionTable();
       let functionTable = this.functionTable;
       let tableBase = this.options.tableBase;
       if (!tableBase) tableBase = 1; // leave first elem blank

src/module.ts

@@ -2486,6 +2486,14 @@ export class Module {
     binaryen._free(cArr);
   }
 
+  /** Ensures that an empty function table of the given name exists, to be sized and filled later. */
+  ensureFunctionTable(name: string): void {
+    let cStr = this.allocStringCached(name);
+    if (!binaryen._BinaryenGetTable(this.ref, cStr)) {
+      binaryen._BinaryenAddTable(this.ref, cStr, 0, Module.UNLIMITED_TABLE, TypeRef.Funcref);
+    }
+  }
+
   /* setFunctionTable(
     initial: Index,
     maximum: Index,

tests/compiler/assert-nonnull.release.wat

@@ -1,7 +1,6 @@
 (module
  (type $0 (func (param i32) (result i32)))
- (type $1 (func (result i32)))
- (type $2 (func (param i32 i32 i32 i32)))
+ (type $1 (func (param i32 i32 i32 i32)))
  (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
  (global $~lib/memory/__stack_pointer (mut i32) (i32.const 34236))
  (memory $0 1)
@@ -15,7 +14,6 @@
  (data $3.1 (i32.const 1304) "\02\00\00\00\1a\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s")
  (data $4 (i32.const 1340) "|")
  (data $4.1 (i32.const 1352) "\02\00\00\00^\00\00\00E\00l\00e\00m\00e\00n\00t\00 \00t\00y\00p\00e\00 \00m\00u\00s\00t\00 \00b\00e\00 \00n\00u\00l\00l\00a\00b\00l\00e\00 \00i\00f\00 \00a\00r\00r\00a\00y\00 \00i\00s\00 \00h\00o\00l\00e\00y")
- (table $0 1 1 funcref)
  (export "memory" (memory $0))
  (export "testVar" (func $export:assert-nonnull/testVar))
  (export "testObj" (func $export:assert-nonnull/testObj))
@@ -165,7 +163,6 @@
     br_if $folding-inner1
     local.get $0
     i32.load
-    call_indirect (type $1)
     unreachable
    end
    i32.const 34256
@@ -283,7 +280,6 @@
     br_if $folding-inner1
     local.get $0
     i32.load
-    call_indirect (type $1)
     unreachable
    end
    i32.const 34256
@@ -344,7 +340,6 @@
    end
    local.get $0
    i32.load
-   call_indirect (type $1)
    unreachable
   end
   i32.const 34256
@@ -456,7 +451,6 @@
    i32.store offset=4
    local.get $0
    i32.load
-   call_indirect (type $1)
    unreachable
   end
   i32.const 34256
@@ -505,7 +499,6 @@
    end
    local.get $0
    i32.load
-   call_indirect (type $1)
    unreachable
   end
   i32.const 34256

tests/compiler/features/relaxed-simd.debug.wat

@@ -83,42 +83,42 @@
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i8x16.laneselect
+  i8x16.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i8x16.laneselect
+  i8x16.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i16x8.laneselect
+  i16x8.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i16x8.laneselect
+  i16x8.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i32x4.laneselect
+  i32x4.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i32x4.laneselect
+  i32x4.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i64x2.laneselect
+  i64x2.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i64x2.laneselect
+  i64x2.relaxed_laneselect
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
@@ -162,11 +162,11 @@
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i16x8.dot_i8x16_i7x16_s
+  i16x8.relaxed_dot_i8x16_i7x16_s
   global.set $features/relaxed-simd/r
   global.get $features/relaxed-simd/v
   global.get $features/relaxed-simd/v
-  i16x8.dot_i8x16_i7x16_s
+  i16x8.relaxed_dot_i8x16_i7x16_s
   global.set $features/relaxed-simd/r
  )
  (func $~start