Remove tag registry.

Author: woess

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/Linker.java

@@ -549,8 +549,7 @@ void resolveTagImport(WasmStore store, WasmInstance instance, ImportDescriptor i
             final WasmTag importedTag;
             final WasmTag externalTag = lookupImportObject(instance, importDescriptor, imports, WasmTag.class);
             if (externalTag != null) {
-                final int contextTagIndex = store.tags().register(externalTag);
-                importedTag = store.tags().tag(contextTagIndex);
+                importedTag = externalTag;
                 assert tagIndex == importDescriptor.targetIndex();
             } else {
                 final WasmInstance importedInstance = store.lookupModuleInstance(importedModuleName);

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/SymbolTable.java

@@ -1165,9 +1165,7 @@ public void allocateTag(int index, byte attribute, int typeIndex) {
         addTag(index, attribute, typeIndex);
         module().addLinkAction((context, store, instance, imports) -> {
             final WasmTag tag = new WasmTag(typeAt(typeIndex));
-            final int tagAddress = store.tags().register(tag);
-            final WasmTag allocatedTag = store.tags().tag(tagAddress);
-            instance.setTag(index, allocatedTag);
+            instance.setTag(index, tag);
         });
     }
 

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/TagRegistry.java

@@ -210,9 +210,7 @@ static List<LinkAction> recreateLinkActions(WasmModule module) {
             } else {
                 linkActions.add((context, store, instance, imports) -> {
                     final WasmTag tag = new WasmTag(type);
-                    final int address = store.tags().register(tag);
-                    final WasmTag allocatedTag = store.tags().tag(address);
-                    instance.setTag(tagIndex, allocatedTag);
+                    instance.setTag(tagIndex, tag);
                 });
             }
         }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java

@@ -70,7 +70,6 @@ public final class WasmStore implements TruffleObject {
     private final WasmLanguage language;
     private final MemoryRegistry memoryRegistry;
     private final TableRegistry tableRegistry;
-    private final TagRegistry tagRegistry;
     private final Linker linker;
     private final Map<String, WasmInstance> moduleInstances;
     private final FdManager filesManager;
@@ -82,7 +81,6 @@ public WasmStore(WasmContext context, WasmLanguage language) {
         this.contextOptions = context.getContextOptions();
         this.tableRegistry = new TableRegistry();
         this.memoryRegistry = new MemoryRegistry();
-        this.tagRegistry = new TagRegistry();
         this.moduleInstances = new LinkedHashMap<>();
         this.linker = new Linker();
         this.filesManager = context.fdManager();
@@ -108,10 +106,6 @@ public TableRegistry tables() {
         return tableRegistry;
     }
 
-    public TagRegistry tags() {
-        return tagRegistry;
-    }
-
     public Linker linker() {
         return linker;
     }