fix: Move compilation of instanceof helpers post override discovery (#…

…2661)
AssemblyScript · Mar 3, 2023 · 9497c3d · 9497c3d
1 parent b745216
commit 9497c3d
Show file tree

Hide file tree

Showing 4 changed files with 722 additions and 520 deletions.
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -559,25 +559,6 @@ export class Compiler extends DiagnosticEmitter {
       }
     } while (lazyFunctions.size);
 
-    // compile pending instanceof helpers
-    for (let _keys = Map_keys(this.pendingInstanceOf), i = 0, k = _keys.length; i < k; ++i) {
-      let elem = _keys[i];
-      let name = assert(this.pendingInstanceOf.get(elem));
-      switch (elem.kind) {
-        case ElementKind.Class:
-        case ElementKind.Interface: {
-          this.finalizeInstanceOf(<Class>elem, name);
-          break;
-        }
-        case ElementKind.ClassPrototype:
-        case ElementKind.InterfacePrototype: {
-          this.finalizeAnyInstanceOf(<ClassPrototype>elem, name);
-          break;
-        }
-        default: assert(false);
-      }
-    }
-
     // set up override stubs
     let functionTable = this.functionTable;
     let overrideStubs = this.overrideStubs;
@@ -611,6 +592,25 @@ export class Compiler extends DiagnosticEmitter {
       this.finalizeOverrideStub(_values[i]);
     }
 
+    // compile pending instanceof helpers
+    for (let _keys = Map_keys(this.pendingInstanceOf), i = 0, k = _keys.length; i < k; ++i) {
+      let elem = _keys[i];
+      let name = assert(this.pendingInstanceOf.get(elem));
+      switch (elem.kind) {
+        case ElementKind.Class:
+        case ElementKind.Interface: {
+          this.finalizeInstanceOf(<Class>elem, name);
+          break;
+        }
+        case ElementKind.ClassPrototype:
+        case ElementKind.InterfacePrototype: {
+          this.finalizeAnyInstanceOf(<ClassPrototype>elem, name);
+          break;
+        }
+        default: assert(false);
+      }
+    }
+
     // finalize runtime features
     module.removeGlobal(BuiltinNames.rtti_base);
     if (this.runtimeFeatures & RuntimeFeatures.Rtti) compileRTTI(this);