summaryrefslogtreecommitdiff
path: root/src/wasm/wasm-emscripten.cpp
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2020-06-11 16:18:54 -0700
committerGitHub <noreply@github.com>2020-06-11 16:18:54 -0700
commit49f2443338c00931d2f30f9d8c1706398bd5cb34 (patch)
treebdb148f40eeacb4ef139c85bad17970a870b1880 /src/wasm/wasm-emscripten.cpp
parentf813ac9fd58849043ed25c8543af6f6a884d506c (diff)
downloadbinaryen-49f2443338c00931d2f30f9d8c1706398bd5cb34.tar.gz
binaryen-49f2443338c00931d2f30f9d8c1706398bd5cb34.tar.bz2
binaryen-49f2443338c00931d2f30f9d8c1706398bd5cb34.zip
Move optional metadata field so its not last (#2909)
To avoid the conditional trailing comma.
Diffstat (limited to 'src/wasm/wasm-emscripten.cpp')
-rw-r--r--src/wasm/wasm-emscripten.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index a57573254..4a8f2c0c3 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -1217,13 +1217,6 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata(
});
meta << "\n ],\n";
- meta << " \"features\": [";
- commaFirst = true;
- wasm.features.iterFeatures([&](FeatureSet::Feature f) {
- meta << nextElement() << "\"--enable-" << FeatureSet::toString(f) << '"';
- });
- meta << "\n ],\n";
-
// In normal mode we attempt to determine if main takes argumnts or not
// In standalone mode we export _start instead and rely on the presence
// of the __wasi_args_get and __wasi_args_sizes_get syscalls allow us to
@@ -1247,9 +1240,16 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata(
}
}
}
- meta << " \"mainReadsParams\": " << int(mainReadsParams) << '\n';
+ meta << " \"mainReadsParams\": " << int(mainReadsParams) << ",\n";
}
+ meta << " \"features\": [";
+ commaFirst = true;
+ wasm.features.iterFeatures([&](FeatureSet::Feature f) {
+ meta << nextElement() << "\"--enable-" << FeatureSet::toString(f) << '"';
+ });
+ meta << "\n ]\n";
+
meta << "}\n";
return meta.str();