1 files changed, 17 insertions, 18 deletions

diff --git a/src/tools/wasm-metadce.cpp b/src/tools/wasm-metadce.cpp
index a0890c8c4..29ac01f90 100644
--- a/src/tools/wasm-metadce.cpp
+++ b/src/tools/wasm-metadce.cpp
@@ -58,12 +58,12 @@ struct MetaDCEGraph {
   std::unordered_map<Name, Name> exportToDCENode;
   std::unordered_map<Name, Name> functionToDCENode; // function name => DCE name
   std::unordered_map<Name, Name> globalToDCENode;   // global name => DCE name
-  std::unordered_map<Name, Name> eventToDCENode;    // event name => DCE name
+  std::unordered_map<Name, Name> tagToDCENode;      // tag name => DCE name
 
   std::unordered_map<Name, Name> DCENodeToExport; // reverse maps
   std::unordered_map<Name, Name> DCENodeToFunction;
   std::unordered_map<Name, Name> DCENodeToGlobal;
-  std::unordered_map<Name, Name> DCENodeToEvent;
+  std::unordered_map<Name, Name> DCENodeToTag;
 
   // imports are not mapped 1:1 to DCE nodes in the wasm, since env.X might
   // be imported twice, for example. So we don't map a DCE node to an Import,
@@ -95,8 +95,8 @@ struct MetaDCEGraph {
     return getImportId(imp->module, imp->base);
   }
 
-  ImportId getEventImportId(Name name) {
-    auto* imp = wasm.getEvent(name);
+  ImportId getTagImportId(Name name) {
+    auto* imp = wasm.getTag(name);
     return getImportId(imp->module, imp->base);
   }
 
@@ -126,14 +126,14 @@ struct MetaDCEGraph {
       globalToDCENode[global->name] = dceName;
       nodes[dceName] = DCENode(dceName);
     });
-    ModuleUtils::iterDefinedEvents(wasm, [&](Event* event) {
-      auto dceName = getName("event", event->name.str);
-      DCENodeToEvent[dceName] = event->name;
-      eventToDCENode[event->name] = dceName;
+    ModuleUtils::iterDefinedTags(wasm, [&](Tag* tag) {
+      auto dceName = getName("tag", tag->name.str);
+      DCENodeToTag[dceName] = tag->name;
+      tagToDCENode[tag->name] = dceName;
       nodes[dceName] = DCENode(dceName);
     });
-    // only process function, global, and event imports - the table and memory
-    // are always there
+    // only process function, global, and tag imports - the table and memory are
+    // always there
     ModuleUtils::iterImportedFunctions(wasm, [&](Function* import) {
       auto id = getImportId(import->module, import->base);
       if (importIdToDCENode.find(id) == importIdToDCENode.end()) {
@@ -148,7 +148,7 @@ struct MetaDCEGraph {
         importIdToDCENode[id] = dceName;
       }
     });
-    ModuleUtils::iterImportedEvents(wasm, [&](Event* import) {
+    ModuleUtils::iterImportedTags(wasm, [&](Tag* import) {
       auto id = getImportId(import->module, import->base);
       if (importIdToDCENode.find(id) == importIdToDCENode.end()) {
         auto dceName = getName("importId", import->name.str);
@@ -178,12 +178,11 @@ struct MetaDCEGraph {
           node.reaches.push_back(
             importIdToDCENode[getGlobalImportId(exp->value)]);
         }
-      } else if (exp->kind == ExternalKind::Event) {
-        if (!wasm.getEvent(exp->value)->imported()) {
-          node.reaches.push_back(eventToDCENode[exp->value]);
+      } else if (exp->kind == ExternalKind::Tag) {
+        if (!wasm.getTag(exp->value)->imported()) {
+          node.reaches.push_back(tagToDCENode[exp->value]);
         } else {
-          node.reaches.push_back(
-            importIdToDCENode[getEventImportId(exp->value)]);
+          node.reaches.push_back(importIdToDCENode[getTagImportId(exp->value)]);
         }
       }
     }
@@ -394,8 +393,8 @@ public:
       if (DCENodeToGlobal.find(name) != DCENodeToGlobal.end()) {
         std::cout << "  is global " << DCENodeToGlobal[name] << '\n';
       }
-      if (DCENodeToEvent.find(name) != DCENodeToEvent.end()) {
-        std::cout << "  is event " << DCENodeToEvent[name] << '\n';
+      if (DCENodeToTag.find(name) != DCENodeToTag.end()) {
+        std::cout << "  is tag " << DCENodeToTag[name] << '\n';
       }
       for (auto target : node.reaches) {
         std::cout << "  reaches: " << target.str << '\n';