From 00e5546b3d1ceb4b34f38668bece2d0bcb3af942 Mon Sep 17 00:00:00 2001 From: dcode Date: Sat, 11 Sep 2021 14:57:27 +0200 Subject: [PATCH 1/2] Properly skip duplicate class id exports --- src/compiler.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler.ts b/src/compiler.ts index 31f84f065a..cabec5613a 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -948,7 +948,11 @@ export class Compiler extends DiagnosticEmitter { module.addGlobal(internalName, TypeRef.I32, false, module.i32(classInstance.id)); this.doneModuleExports.add(element); } - module.addGlobalExport(internalName, prefix + name); + + let exportName = prefix + name; + if (!module.hasExport(exportName)) { + module.addGlobalExport(internalName, prefix + name); + } } break; } From f95dd21958db36cd6144c986d0639be10574ad3f Mon Sep 17 00:00:00 2001 From: dcode Date: Sat, 11 Sep 2021 15:00:06 +0200 Subject: [PATCH 2/2] reuse exportName --- src/compiler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler.ts b/src/compiler.ts index cabec5613a..c3c3778a05 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -951,7 +951,7 @@ export class Compiler extends DiagnosticEmitter { let exportName = prefix + name; if (!module.hasExport(exportName)) { - module.addGlobalExport(internalName, prefix + name); + module.addGlobalExport(internalName, exportName); } } break;