[wasm64] Fix MEMORY64=2 after emscripten-core#22773

sbc100 · sbc100 · commit b79e18738d23 · 2024-11-05T15:33:28.000-08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -641,6 +641,7 @@ jobs:
             wasm64l.test_hello_world
             wasm64l.test_bigswitch
             wasm64l.test_module_wasm_memory
+            wasm64l.test_longjmp2_emscripten
             other.test_memory64_proxies
             other.test_failing_growth_wasm64"
       - upload-test-results
diff --git a/src/parseTools.mjs b/src/parseTools.mjs
@@ -964,7 +964,8 @@ function from64Expr(x, assign = true) {
 }
 
 function toIndexType(x) {
-  return to64(x);
+  if (MEMORY64 == 1) return `BigInt(${x})`;
+  return x;
 }
 
 function to64(x) {

Original file line number	Diff line number	Diff line change
`@@ -964,7 +964,8 @@ function from64Expr(x, assign = true) {`
`964`	`964`	`}`
`965`	`965`
`966`	`966`	`function toIndexType(x) {`
`967`		`- return to64(x);`
	`967`	+ if (MEMORY64 == 1) return `BigInt(${x})`;
	`968`	`+ return x;`
`968`	`969`	`}`
`969`	`970`
`970`	`971`	`function to64(x) {`