Landing requested on , by pchevrel@mozilla.com.
Landing Job:
8624
Revisions:
D255160
diff 1073518
While applying revision D255160 to firefox-esr115, the following files had
conflicts:
(Hint: try rebasing your changes on the latest commits from firefox-esr115 and re-submitting.)
-
js/src/wasm/WasmConstants.h @ 563a46bd7f057d199f6466139a8d780866bc8522
diff a/js/src/wasm/WasmConstants.h b/js/src/wasm/WasmConstants.h (rejected hunks)
@@ -1179,11 +1179,11 @@
...
diff a/js/src/wasm/WasmConstants.h b/js/src/wasm/WasmConstants.h (rejected hunks)
@@ -1179,11 +1179,11 @@
(uint64_t(1) << (8 * sizeof(uint32_t))));
// These limits pertain to our WebAssembly implementation only.
static const unsigned MaxTryTableCatches = 10000;
-static const unsigned MaxBrTableElems = 1000000;
+static const unsigned MaxBrTableElems = 65520;
static const unsigned MaxCodeSectionBytes = MaxModuleBytes;
static const unsigned MaxBranchHintValue = 2;
// 512KiB should be enough, considering how Rabaldr uses the stack and
// what the standard limits are:
Last update:
Raw error output:
Problem while applying patch in revision 255160:
Checking patch js/src/jit-test/tests/asm.js/testControlFlow.js...
Checking patch js/src/wasm/WasmConstants.h...
error: while searching for:
(uint64_t(1) << (8 * sizeof(uint32_t))));
// These limits pertain to our WebAssembly implementation only.
static const unsigned MaxTryTableCatches = 10000;
static const unsigned MaxBrTableElems = 1000000;
static const unsigned MaxCodeSectionBytes = MaxModuleBytes;
static const unsigned MaxBranchHintValue = 2;
// 512KiB should be enough, considering how Rabaldr uses the stack and
// what the standard limits are:
error: patch failed: js/src/wasm/WasmConstants.h:1179
Applied patch js/src/jit-test/tests/asm.js/testControlFlow.js cleanly.
Applying patch js/src/wasm/WasmConstants.h with 1 reject...
Rejected hunk #1.