backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

Block duplicate export names

Browse Source
This commit is contained in:
Volker Berlin 2022-04-10 11:35:20 +02:00
parent ee8e9c797e
commit 9c7b69b2a7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
View File

@ -24,6 +24,7 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -83,6 +84,9 @@ public class ModuleGenerator {
private final CodeOptimizer optimizer; private final CodeOptimizer optimizer;
private final StaticCodeBuilder staticCodeBuilder; private final StaticCodeBuilder staticCodeBuilder;
private final HashSet<String> exportNames = new HashSet<>();
/** /**
* Create a new generator. * Create a new generator.
* *
@ -676,9 +680,13 @@ public class ModuleGenerator {
Map<String,Object> export = functions.getExportAnannotation( name ); Map<String,Object> export = functions.getExportAnannotation( name );
if( export != null ) { if( export != null ) {
String exportName = (String)export.get( "name" ); String exportName = (String)export.get( "name" );
if( exportName == null ) { if( exportName == null || exportName.isEmpty() ) {
exportName = method.getName(); // TODO naming conversion rule if no name was set exportName = method.getName(); // TODO naming conversion rule if no name was set
} }
JWebAssembly.LOGGER.fine( "Export " + name.fullName + " as '" + exportName + "'" );
if( !exportNames.add( exportName ) ) {
throw new WasmException( "Duplicate export name '" + exportName + "' for " + name.fullName + ". Rename the method or use the 'name' attribute of the @Export annotation to create a unique export name.", -1 );
}
writer.writeExport( name, exportName ); writer.writeExport( name, exportName );
} }
} }