Move features from passOptions to Module (#2001)

This allows us to emit a (potentially modified) target features
section and conditionally emit other sections such as the DataCount
section based on the presence of features.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index e39d9e2d6..46fb0533b 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -130,7 +130,7 @@ int main(int argc, const char *argv[]) {
     Fatal() << "error in parsing wasm source map";
   }
 
-  options.calculateFeatures(wasm);
+  options.applyFeatures(wasm);
 
   if (options.debug) {
     std::cerr << "Module before:\n";
@@ -210,7 +210,7 @@ int main(int argc, const char *argv[]) {
   }
 
   // Substantial changes to the wasm are done, enough to create the metadata.
-  std::string metadata = generator.generateEmscriptenMetadata(dataSize, initializerFunctions, options.passOptions.features);
+  std::string metadata = generator.generateEmscriptenMetadata(dataSize, initializerFunctions);
 
   // Finally, separate out data segments if relevant (they may have been needed
   // for metadata).