Add bulk-memory-opt feature and ignore call-indirect-overlong (#7139)

LLVM recently split the bulk-memory-opt feature out from bulk-memory,
containing just memory.copy and memory.fill. This change follows that,
making bulk-memory-opt also enabled when all of bulk-memory is enabled.

It also introduces call-indirect-overlong following LLVM, but ignores
it, since Binaryen has always allowed the encoding (i.e. command
line flags enabling or disabling the feature are accepted but
ignored).

2 files changed, 4 insertions, 4 deletions

diff --git a/src/passes/LLVMMemoryCopyFillLowering.cpp b/src/passes/LLVMMemoryCopyFillLowering.cpp
index e5b940a5a..d2a7e5c48 100644
--- a/src/passes/LLVMMemoryCopyFillLowering.cpp
+++ b/src/passes/LLVMMemoryCopyFillLowering.cpp
@@ -49,7 +49,7 @@ struct LLVMMemoryCopyFillLowering
   }
 
   void run(Module* module) override {
-    if (!module->features.hasBulkMemory()) {
+    if (!module->features.hasBulkMemoryOpt()) {
       return;
     }
     if (module->features.hasMemory64() || module->features.hasMultiMemory()) {
@@ -108,7 +108,7 @@ struct LLVMMemoryCopyFillLowering
     } else {
       module->removeFunction(memFillFuncName);
     }
-    module->features.disable(FeatureSet::BulkMemory);
+    module->features.setBulkMemoryOpt(false);
   }
 
   void createMemoryCopyFunc(Module* module) {
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
index 881b7ea1f..792cf6235 100644
--- a/src/passes/OptimizeInstructions.cpp
+++ b/src/passes/OptimizeInstructions.cpp
@@ -1275,7 +1275,7 @@ struct OptimizeInstructions
     if (curr->type == Type::unreachable) {
       return;
     }
-    assert(getModule()->features.hasBulkMemory());
+    assert(getModule()->features.hasBulkMemoryOpt());
     if (auto* ret = optimizeMemoryCopy(curr)) {
       return replaceCurrent(ret);
     }
@@ -1285,7 +1285,7 @@ struct OptimizeInstructions
     if (curr->type == Type::unreachable) {
       return;
     }
-    assert(getModule()->features.hasBulkMemory());
+    assert(getModule()->features.hasBulkMemoryOpt());
     if (auto* ret = optimizeMemoryFill(curr)) {
       return replaceCurrent(ret);
     }