From 9495b338121140d585648d64fb99e8ef7f92f867 Mon Sep 17 00:00:00 2001 From: Thomas Lively <7121787+tlively@users.noreply.github.com> Date: Fri, 12 Apr 2019 18:27:13 -0700 Subject: 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. --- src/wasm/wasm-emscripten.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/wasm/wasm-emscripten.cpp') diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp index 1b40b871e..da2604383 100644 --- a/src/wasm/wasm-emscripten.cpp +++ b/src/wasm/wasm-emscripten.cpp @@ -823,8 +823,7 @@ void printSet(std::ostream& o, C& c) { } std::string EmscriptenGlueGenerator::generateEmscriptenMetadata( - Address staticBump, std::vector const& initializerFunctions, - FeatureSet features) { + Address staticBump, std::vector const& initializerFunctions) { bool commaFirst; auto nextElement = [&commaFirst]() { if (commaFirst) { @@ -965,7 +964,7 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata( meta << " \"features\": ["; commaFirst = true; meta << nextElement() << "\"--mvp-features\""; - features.iterFeatures([&](FeatureSet::Feature f) { + wasm.features.iterFeatures([&](FeatureSet::Feature f) { meta << nextElement() << "\"--enable-" << FeatureSet::toString(f) << '"'; }); meta << "\n ]\n"; -- cgit v1.2.3