1 files changed, 1 insertions, 42 deletions
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
index c3d53f126..1ddf69d41 100644
--- a/src/wasm/wasm-stack.cpp
+++ b/src/wasm/wasm-stack.cpp
@@ -87,13 +87,6 @@ void BinaryInstWriter::visitCallIndirect(CallIndirect* curr) {
 }
 
 void BinaryInstWriter::visitLocalGet(LocalGet* curr) {
-  if (auto it = extractedGets.find(curr); it != extractedGets.end()) {
-    // We have a tuple of locals to get, but we will only end up using one of
-    // them, so we can just emit that one.
-    o << int8_t(BinaryConsts::LocalGet)
-      << U32LEB(mappedLocals[std::make_pair(curr->index, it->second)]);
-    return;
-  }
   size_t numValues = func->getLocalType(curr->index).size();
   for (Index i = 0; i < numValues; ++i) {
     o << int8_t(BinaryConsts::LocalGet)
@@ -103,28 +96,14 @@ void BinaryInstWriter::visitLocalGet(LocalGet* curr) {
 
 void BinaryInstWriter::visitLocalSet(LocalSet* curr) {
   size_t numValues = func->getLocalType(curr->index).size();
-  // If this is a tuple, set all the elements with nonzero index.
   for (Index i = numValues - 1; i >= 1; --i) {
     o << int8_t(BinaryConsts::LocalSet)
       << U32LEB(mappedLocals[std::make_pair(curr->index, i)]);
   }
   if (!curr->isTee()) {
-    // This is not a tee, so just finish setting the values.
     o << int8_t(BinaryConsts::LocalSet)
       << U32LEB(mappedLocals[std::make_pair(curr->index, 0)]);
-  } else if (auto it = extractedGets.find(curr); it != extractedGets.end()) {
-    // We only need to get the single extracted value.
-    if (it->second == 0) {
-      o << int8_t(BinaryConsts::LocalTee)
-        << U32LEB(mappedLocals[std::make_pair(curr->index, 0)]);
-    } else {
-      o << int8_t(BinaryConsts::LocalSet)
-        << U32LEB(mappedLocals[std::make_pair(curr->index, 0)]);
-      o << int8_t(BinaryConsts::LocalGet)
-        << U32LEB(mappedLocals[std::make_pair(curr->index, it->second)]);
-    }
   } else {
-    // We need to get all the values.
     o << int8_t(BinaryConsts::LocalTee)
       << U32LEB(mappedLocals[std::make_pair(curr->index, 0)]);
     for (Index i = 1; i < numValues; ++i) {
@@ -135,14 +114,8 @@ void BinaryInstWriter::visitLocalSet(LocalSet* curr) {
 }
 
 void BinaryInstWriter::visitGlobalGet(GlobalGet* curr) {
-  Index index = parent.getGlobalIndex(curr->name);
-  if (auto it = extractedGets.find(curr); it != extractedGets.end()) {
-    // We have a tuple of globals to get, but we will only end up using one of
-    // them, so we can just emit that one.
-    o << int8_t(BinaryConsts::GlobalGet) << U32LEB(index + it->second);
-    return;
-  }
   // Emit a global.get for each element if this is a tuple global
+  Index index = parent.getGlobalIndex(curr->name);
   size_t numValues = curr->type.size();
   for (Index i = 0; i < numValues; ++i) {
     o << int8_t(BinaryConsts::GlobalGet) << U32LEB(index + i);
@@ -1997,10 +1970,6 @@ void BinaryInstWriter::visitTupleMake(TupleMake* curr) {
 }
 
 void BinaryInstWriter::visitTupleExtract(TupleExtract* curr) {
-  if (extractedGets.count(curr->tuple)) {
-    // We already have just the extracted value on the stack.
-    return;
-  }
   size_t numVals = curr->tuple->type.size();
   // Drop all values after the one we want
   for (size_t i = curr->index + 1; i < numVals; ++i) {
@@ -2537,7 +2506,6 @@ void BinaryInstWriter::mapLocalsAndEmitHeader() {
     }
   }
   setScratchLocals();
-
   o << U32LEB(numLocalsByType.size());
   for (auto& localType : localTypes) {
     o << U32LEB(numLocalsByType.at(localType));
@@ -2564,15 +2532,6 @@ void BinaryInstWriter::countScratchLocals() {
   for (auto& [type, _] : scratchLocals) {
     noteLocalType(type);
   }
-  // While we have all the tuple.extracts, also find extracts of local.gets,
-  // local.tees, and global.gets that we can optimize.
-  for (auto* extract : extracts.list) {
-    auto* tuple = extract->tuple;
-    if (tuple->is<LocalGet>() || tuple->is<LocalSet>() ||
-        tuple->is<GlobalGet>()) {
-      extractedGets.insert({tuple, extract->index});
-    }
-  }
 }
 
 void BinaryInstWriter::setScratchLocals() {