summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2020-10-29 17:09:48 -0700
committerGitHub <noreply@github.com>2020-10-29 17:09:48 -0700
commiteb81ca4f81a27eb2fa775b8246f24f3bc3ea4f4b (patch)
tree8fea7ce2b5ad3947f97849b5af1c2e29c25bad4c /src/tools
parentb59f61678a415ccb3baa8074556c6b8759edc593 (diff)
downloadbinaryen-eb81ca4f81a27eb2fa775b8246f24f3bc3ea4f4b.tar.gz
binaryen-eb81ca4f81a27eb2fa775b8246f24f3bc3ea4f4b.tar.bz2
binaryen-eb81ca4f81a27eb2fa775b8246f24f3bc3ea4f4b.zip
wasm-emscripten-finalize: Remove staticBump from metadata (#3300)
Emscripten no longer needs this information as of https://github.com/emscripten-core/emscripten/pull/12643. This also removes the need to export __data_end.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/wasm-emscripten-finalize.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index d76bd4fc9..844dfbb60 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -225,30 +225,6 @@ int main(int argc, const char* argv[]) {
BYN_DEBUG_WITH_TYPE("emscripten-dump",
WasmPrinter::printModule(&wasm, std::cerr));
- uint32_t dataSize = 0;
-
- if (!sideModule) {
- if (globalBase == INVALID_BASE) {
- Fatal() << "globalBase must be set";
- }
- Export* dataEndExport = wasm.getExport("__data_end");
- if (dataEndExport == nullptr) {
- Fatal() << "__data_end export not found";
- }
- Global* dataEnd = wasm.getGlobal(dataEndExport->value);
- if (dataEnd == nullptr) {
- Fatal() << "__data_end global not found";
- }
- if (dataEnd->type != Type::i32) {
- Fatal() << "__data_end global has wrong type";
- }
- if (dataEnd->imported()) {
- Fatal() << "__data_end must not be an imported global";
- }
- Const* dataEndConst = dataEnd->init->cast<Const>();
- dataSize = dataEndConst->value.geti32() - globalBase;
- }
-
EmscriptenGlueGenerator generator(wasm);
generator.standalone = standaloneWasm;
generator.sideModule = sideModule;
@@ -326,7 +302,7 @@ int main(int argc, const char* argv[]) {
BYN_TRACE("generated metadata\n");
// Substantial changes to the wasm are done, enough to create the metadata.
std::string metadata =
- generator.generateEmscriptenMetadata(dataSize, initializerFunctions);
+ generator.generateEmscriptenMetadata(initializerFunctions);
// Finally, separate out data segments if relevant (they may have been needed
// for metadata).