From: stephan <stephan@noemail.net>
Date: Sun, 21 Sep 2025 19:01:15 +0000 (+0000)
Subject: Remove some dead code and stray debug output. Fix (again) the JS SQLTester for 64... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf0f11ac18804c9986ccb1be332dde0d54dae94d;p=thirdparty%2Fsqlite.git

Remove some dead code and stray debug output. Fix (again) the JS SQLTester for 64-bit (the previous build was set to 32-bit).

FossilOrigin-Name: a6b9567001dad0293dc6a7fe9a7ec1a220e41d9426448e2ab91dbd551948be15
---

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 164464fb5f..394cba69d3 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -443,7 +443,7 @@ cflags.common =  -I. -I$(dir $(sqlite3.c))
 # disables certain features if BigInt is not enabled and such builds
 # _are not tested_ on any regular basis.
 emcc.WASM_BIGINT ?= 1
-emcc.MEMORY64 ?= 0
+emcc.MEMORY64 ?= 1
 ########################################################################
 # https://emscripten.org/docs/tools_reference/settings_reference.html#memory64
 #
diff --git a/ext/wasm/SQLTester/SQLTester.mjs b/ext/wasm/SQLTester/SQLTester.mjs
index 619efebd32..61f6aea2cf 100644
--- a/ext/wasm/SQLTester/SQLTester.mjs
+++ b/ext/wasm/SQLTester/SQLTester.mjs
@@ -63,16 +63,6 @@ if( 0 && globalThis.WorkerGlobalScope ){
     });
   }
 }
-
-const wPost = (function(){
-  return (('undefined'===typeof WorkerGlobalScope)
-          ? ()=>{}
-          : (type, payload)=>{
-            postMessage({type, payload});
-          });
-})();
-//log("WorkerGlobalScope",globalThis.WorkerGlobalScope);
-
 // Return a new enum entry value
 const newE = ()=>Object.create(null);
 
@@ -522,6 +512,8 @@ class SQLTester {
   }
 
   runTests(){
+    this.outln("SQLite version ", sqlite3.capi.sqlite3_libversion()," with ",
+               sqlite3.wasm.ptr.size, "-byte WASM pointers");
     const tStart = (new Date()).getTime();
     let isVerbose = this.verbosity();
     this.metrics.failedScripts.length = 0;
@@ -638,15 +630,15 @@ class SQLTester {
     const sb = (ResultBufferMode.NONE===appendMode) ? null : this.#resultBuffer;
     let rc = 0;
     wasm.scopedAllocCall(function(){
-      let sqlByteLen = sql.byteLength;
+      let sqlByteLen = Number(sql.byteLength);
       const ppStmt = wasm.scopedAlloc(
-        /* output (sqlite3_stmt**) arg and pzTail */
-        (2 * wasm.ptr.size) + (sqlByteLen + 1/* SQL + NUL */)
+        (2 * wasm.ptr.size) /* output (sqlite3_stmt**) arg and pzTail */
+        + (sqlByteLen + 1/* SQL + NUL */)
       );
-      const pzTail = ppStmt + wasm.ptr.size /* final arg to sqlite3_prepare_v2() */;
-      let pSql = pzTail + wasm.ptr.size;
+      const pzTail = wasm.ptr.add(ppStmt, wasm.ptr.size) /* final arg to sqlite3_prepare_v2() */;
+      let pSql = wasm.ptr.add(pzTail, wasm.ptr.size);
       const pSqlEnd = wasm.ptr.add(pSql, sqlByteLen);
-      wasm.heap8().set(sql, pSql);
+      wasm.heap8().set(sql, Number(pSql));
       wasm.poke8(pSqlEnd, 0/*NUL terminator*/);
       let pos = 0, n = 1, spacing = 0;
       while( pSql && wasm.peek8(pSql) ){
@@ -664,7 +656,7 @@ class SQLTester {
         }
         const pStmt = wasm.peekPtr(ppStmt);
         pSql = wasm.peekPtr(pzTail);
-        sqlByteLen = pSqlEnd - pSql;
+        sqlByteLen = Number(pSqlEnd - pSql);
         if(!pStmt) continue /* only whitespace or comments */;
         if( sb ){
           const nCol = capi.sqlite3_column_count(pStmt);
diff --git a/ext/wasm/api/extern-post-js.c-pp.js b/ext/wasm/api/extern-post-js.c-pp.js
index 3710c367a7..fdddc062e2 100644
--- a/ext/wasm/api/extern-post-js.c-pp.js
+++ b/ext/wasm/api/extern-post-js.c-pp.js
@@ -62,8 +62,8 @@ const toExportForESM =
   globalThis.sqlite3InitModule = function ff(...args){
     //console.warn("Using replaced sqlite3InitModule()",globalThis.location);
     return originalInit(...args).then((EmscriptenModule)=>{
-      console.warn("originalInit() then() arg =",EmscriptenModule);
-      console.warn("initModuleState =",initModuleState);
+      //console.warn("originalInit() then() arg =",EmscriptenModule);
+      //console.warn("initModuleState =",initModuleState);
       EmscriptenModule.runSQLite3PostLoadInit(EmscriptenModule);
       const s = EmscriptenModule.sqlite3;
       s.scriptInfo = initModuleState;
diff --git a/manifest b/manifest
index 00dfe2f85e..ebef9a38e3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sJS\sSQLTester\sfor\srecent\ssqlite3.wasm\schanges.
-D 2025-09-21T18:42:25.933
+C Remove\ssome\sdead\scode\sand\sstray\sdebug\soutput.\sFix\s(again)\sthe\sJS\sSQLTester\sfor\s64-bit\s(the\sprevious\sbuild\swas\sset\sto\s32-bit).
+D 2025-09-21T19:01:15.620
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -578,11 +578,11 @@ F ext/session/sqlite3session.c 9cd47bfefb23c114b7a5d9ee5822d941398902f30516bf0dd
 F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
 F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 2ec39c303c9d50fd25db97a986565c09cbbea7b08e61977b1b5c8a079adddc5e
+F ext/wasm/GNUmakefile 66dcdb324e598d3acb995936779b0d6ab21eaccf9cbad15c2355bcaca83cef5a
 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
 F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
-F ext/wasm/SQLTester/SQLTester.mjs 0fdfa2c4ebcb040a1a7468005909e580554d017b9b09e6efea84330748937805
+F ext/wasm/SQLTester/SQLTester.mjs 6b3c52ed36a5573ca4883176f326332a8d4c0cecf5efd80489528267fa5d9ed4
 F ext/wasm/SQLTester/SQLTester.run.mjs 57f2adb33f43f2784abbf8026c1bfd049d8013af1998e7dcb8b50c89ffc332e0
 F ext/wasm/SQLTester/index.html 64f3435084c7d6139b08d1f2a713828a73f68de2ae6a3112cbb5980d991ba06f
 F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
@@ -591,7 +591,7 @@ F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras cb4fa8842c875b6ee99381523792975
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 7f029c5fe83b3493931d2fb915e2febd3536267d538a56408a6fef284ea38d29
-F ext/wasm/api/extern-post-js.c-pp.js 9c3760a5991bf46ec628d713e11db71230f07c079bfe0f05ef30177a8e025385
+F ext/wasm/api/extern-post-js.c-pp.js c4801f87c18c9c738295eef199efbb9fe4e42ff25ae6927953dd3a27bac74bce
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js 365405929f41ca0e6d389ed8a8da3f3c93e11d3ef43a90ae151e37fa9f75bf41
 F ext/wasm/api/post-js-header.js 53740d824e5d9027eb1e6fd59e216abbd2136740ce260ea5f0699ff2acb0a701
@@ -2175,8 +2175,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 074cf4e6c1775900204bb0d920111ee19601d5c63690e79e988e7fe6b040a647
-R 7b87cd439eaa1396eced3d3cc2518965
+P 0fa1830540bcb86f5c59b1a6a9ffd8727c194a64a131d9d362023c84a3b820cb
+R dc2d67fd32c35033587eba9e2fc11a68
 U stephan
-Z a1a3809a1520792410b21f678cbcd51f
+Z 79efec95b48f9fbd6fa325e464638c1d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 123aa89024..88de525537 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0fa1830540bcb86f5c59b1a6a9ffd8727c194a64a131d9d362023c84a3b820cb
+a6b9567001dad0293dc6a7fe9a7ec1a220e41d9426448e2ab91dbd551948be15