Disable the memory64 feature in Memory64Lowering.cpp

src/passes/Memory64Lowering.cpp

@@ -159,6 +159,14 @@ struct Memory64Lowering : public WalkerPass<PostWalker<Memory64Lowering>> {
       }
     }
   }
+
+  void run(Module* module) override {
+    if (!module->features.has(FeatureSet::Memory64)) {
+      return;
+    }
+    super::run(module);
+    module->features.disable(FeatureSet::Memory64);
+  }
 };
 
 Pass* createMemory64LoweringPass() { return new Memory64Lowering(); }

src/passes/SignExtLowering.cpp

@@ -68,6 +68,14 @@ struct SignExtLowering : public WalkerPass<PostWalker<SignExtLowering>> {
       }
     }
   }
+
+  void run(Module* module) override {
+    if (!module->features.has(FeatureSet::SignExt)) {
+      return;
+    }
+    super::run(module);
+    module->features.disable(FeatureSet::SignExt);
+  }
 };
 
 Pass* createSignExtLoweringPass() { return new SignExtLowering(); }

src/passes/pass.cpp

@@ -408,7 +408,8 @@ void PassRegistry::registerPasses() {
                "apply more specific subtypes to signature types where possible",
                createSignatureRefiningPass);
   registerPass("signext-lowering",
-               "lower sign-ext operations to wasm mvp",
+               "lower sign-ext operations to wasm mvp and disable the sign "
+               "extension feature",
                createSignExtLoweringPass);
   registerPass("simplify-globals",
                "miscellaneous globals-related optimizations",

test/lit/help/wasm-opt.test

@@ -399,7 +399,8 @@
 ;; CHECK-NEXT:                                                 signature types where possible
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --signext-lowering                            lower sign-ext operations to
-;; CHECK-NEXT:                                                 wasm mvp
+;; CHECK-NEXT:                                                 wasm mvp and disable the sign
+;; CHECK-NEXT:                                                 extension feature
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --simplify-globals                            miscellaneous globals-related
 ;; CHECK-NEXT:                                                 optimizations

test/lit/help/wasm2js.test

@@ -358,7 +358,8 @@
 ;; CHECK-NEXT:                                                 signature types where possible
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --signext-lowering                            lower sign-ext operations to
-;; CHECK-NEXT:                                                 wasm mvp
+;; CHECK-NEXT:                                                 wasm mvp and disable the sign
+;; CHECK-NEXT:                                                 extension feature
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --simplify-globals                            miscellaneous globals-related
 ;; CHECK-NEXT:                                                 optimizations

test/lit/passes/memory64-lowering-features.wast

@@ -0,0 +1,9 @@
+;; RUN: wasm-opt %s --enable-memory64 --print-features --print --memory64-lowering --print-features | filecheck %s
+
+;; Check that the --memory64-lowering pass disables the signext feature.
+
+;; CHECK: --enable-memory64
+;; CHECK: (module
+;; CHECK-NOT: --enable-memory64
+
+(module)

test/lit/passes/signext-lowering-features.wast

@@ -0,0 +1,9 @@
+;; RUN: wasm-opt %s --enable-sign-ext --print-features --print --signext-lowering --print-features | filecheck %s
+
+;; Check that the --signext-lowering pass disables the signext feature.
+
+;; CHECK: --enable-sign-ext
+;; CHECK: (module
+;; CHECK-NOT: --enable-sign-ext
+
+(module)