1 files changed, 3 insertions, 6 deletions
diff --git a/src/passes/RemoveNonJSOps.cpp b/src/passes/RemoveNonJSOps.cpp
index 5bbb9f701..1c112e760 100644
--- a/src/passes/RemoveNonJSOps.cpp
+++ b/src/passes/RemoveNonJSOps.cpp
@@ -125,9 +125,7 @@ struct RemoveNonJSOpsPass : public WalkerPass<PostWalker<RemoveNonJSOpsPass>> {
     MemoryUtils::ensureExists(module->memory);
 
     // Add missing globals
-    for (auto& pair : neededImportedGlobals) {
-      auto name = pair.first;
-      auto type = pair.second;
+    for (auto& [name, type] : neededImportedGlobals) {
       if (!getModule()->getGlobalOrNull(name)) {
         auto global = make_unique<Global>();
         global->name = name;
@@ -141,10 +139,9 @@ struct RemoveNonJSOpsPass : public WalkerPass<PostWalker<RemoveNonJSOpsPass>> {
   }
 
   void addNeededFunctions(Module& m, Name name, std::set<Name>& needed) {
-    if (needed.count(name)) {
+    if (!needed.emplace(name).second) {
       return;
     }
-    needed.insert(name);
 
     auto function = m.getFunction(name);
     FindAll<Call> calls(function->body);
@@ -334,7 +331,7 @@ struct RemoveNonJSOpsPass : public WalkerPass<PostWalker<RemoveNonJSOpsPass>> {
   }
 
   void visitGlobalGet(GlobalGet* curr) {
-    neededImportedGlobals.insert(std::make_pair(curr->name, curr->type));
+    neededImportedGlobals.insert({curr->name, curr->type});
   }
 };