Add warning when legacy parseTools functions are used. NFC (#19707)

Author: sbc100

src/library_wasmfs_jsimpl.js

@@ -24,16 +24,18 @@ mergeInto(LibraryManager.library, {
     return wasmFS$backends[backend].freeFile(file);
   },
 
+  _wasmfs_jsimpl_write__deps: i53ConversionDeps,
   _wasmfs_jsimpl_write: function(backend, file, buffer, length, {{{ defineI64Param('offset') }}}) {
-    {{{ receiveI64ParamAsDouble('offset') }}}
+    {{{ receiveI64ParamAsI53('offset') }}}
 #if ASSERTIONS
     assert(wasmFS$backends[backend]);
 #endif
     return wasmFS$backends[backend].write(file, buffer, length, offset);
   },
 
+  _wasmfs_jsimpl_read__deps: i53ConversionDeps,
   _wasmfs_jsimpl_read: function(backend, file, buffer, length, {{{ defineI64Param('offset') }}}) {
-    {{{ receiveI64ParamAsDouble('offset') }}}
+    {{{ receiveI64ParamAsI53('offset') }}}
 #if ASSERTIONS
     assert(wasmFS$backends[backend]);
 #endif
@@ -70,9 +72,9 @@ mergeInto(LibraryManager.library, {
     _emscripten_proxy_finish(ctx);
   },
 
-  _wasmfs_jsimpl_async_write__deps: ['emscripten_proxy_finish'],
+  _wasmfs_jsimpl_async_write__deps: ['emscripten_proxy_finish'].concat(i53ConversionDeps),
   _wasmfs_jsimpl_async_write: async function(ctx, backend, file, buffer, length, {{{ defineI64Param('offset') }}}, result_p) {
-    {{{ receiveI64ParamAsDouble('offset') }}}
+    {{{ receiveI64ParamAsI53('offset') }}}
 #if ASSERTIONS
     assert(wasmFS$backends[backend]);
 #endif
@@ -81,9 +83,9 @@ mergeInto(LibraryManager.library, {
     _emscripten_proxy_finish(ctx);
   },
 
-  _wasmfs_jsimpl_async_read__deps: ['emscripten_proxy_finish'],
+  _wasmfs_jsimpl_async_read__deps: ['emscripten_proxy_finish'].concat(i53ConversionDeps),
   _wasmfs_jsimpl_async_read: async function(ctx, backend, file, buffer, length, {{{ defineI64Param('offset') }}}, result_p) {
-    {{{ receiveI64ParamAsDouble('offset') }}}
+    {{{ receiveI64ParamAsI53('offset') }}}
 #if ASSERTIONS
     assert(wasmFS$backends[backend]);
 #endif

src/library_wasmfs_opfs.js

@@ -410,11 +410,11 @@ mergeInto(LibraryManager.library, {
     wasmfsOPFSProxyFinish(ctx);
   },
 
-  _wasmfs_opfs_set_size_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'],
+  _wasmfs_opfs_set_size_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'].concat(i53ConversionDeps),
   _wasmfs_opfs_set_size_access: async function(ctx, accessID,
                                                {{{ defineI64Param('size') }}},
                                                errPtr) {
-    {{{ receiveI64ParamAsDouble('size') }}};
+    {{{ receiveI64ParamAsI53('size') }}};
     let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
     try {
       await accessHandle.truncate(size);
@@ -425,11 +425,11 @@ mergeInto(LibraryManager.library, {
     wasmfsOPFSProxyFinish(ctx);
   },
 
-  _wasmfs_opfs_set_size_file__deps: ['$wasmfsOPFSFileHandles', '$wasmfsOPFSProxyFinish'],
+  _wasmfs_opfs_set_size_file__deps: ['$wasmfsOPFSFileHandles', '$wasmfsOPFSProxyFinish'].concat(i53ConversionDeps),
   _wasmfs_opfs_set_size_file: async function(ctx, fileID,
                                              {{{ defineI64Param('size') }}},
                                              errPtr) {
-    {{{ receiveI64ParamAsDouble('size') }}};
+    {{{ receiveI64ParamAsI53('size') }}};
     let fileHandle = wasmfsOPFSFileHandles.get(fileID);
     try {
       let writable = await fileHandle.createWritable({keepExistingData: true});

src/parseTools_legacy.js

@@ -8,13 +8,15 @@
 // Should probably be renamed to `makeReturn64` but keeping this old name in
 // case external JS library code uses this name.
 function makeStructuralReturn(values) {
+  warn('use of legacy parseTools function: makeStructuralReturn');
   assert(values.length == 2);
   return 'setTempRet0(' + values[1] + '); return ' + asmCoercion(values[0], 'i32');
 }
 
 // Replaced (at least internally) with receiveI64ParamAsI53 that does
 // bounds checking.
 function receiveI64ParamAsDouble(name) {
+  warn('use of legacy parseTools function: receiveI64ParamAsDouble');
   if (WASM_BIGINT) {
     // Just convert the bigint into a double.
     return `${name} = Number(${name});`;
@@ -25,13 +27,15 @@ function receiveI64ParamAsDouble(name) {
 }
 
 function receiveI64ParamAsI32s(name) {
+  warn('use of legacy parseTools function: receiveI64ParamAsI32s');
   if (WASM_BIGINT) {
     return `var ${name}_low = Number(${name} & 0xffffffffn) | 0, ${name}_high = Number(${name} >> 32n) | 0;`;
   }
   return '';
 }
 
 function stripCorrections(param) {
+  warn('use of legacy parseTools function: stripCorrections');
   let m;
   while (true) {
     if (m = /^\((.*)\)$/.exec(param)) {
@@ -62,6 +66,7 @@ function stripCorrections(param) {
 const UNROLL_LOOP_MAX = 8;
 
 function makeCopyValues(dest, src, num, type, modifier, align, sep = ';') {
+  warn('use of legacy parseTools function: makeCopyValues');
   assert(typeof align === 'undefined');
   function unroll(type, num, jump = 1) {
     const setValues = range(num).map((i) => makeSetValue(dest, i * jump, makeGetValue(src, i * jump, type), type));
@@ -93,10 +98,12 @@ function makeCopyValues(dest, src, num, type, modifier, align, sep = ';') {
 }
 
 function makeMalloc(source, param) {
+  warn('use of legacy parseTools function: makeMalloc');
   return `_malloc(${param})`;
 }
 
 function getNativeFieldSize(type) {
+  warn('use of legacy parseTools function: getNativeFieldSize');
   return Math.max(getNativeTypeSize(type), POINTER_SIZE);
 }
 
@@ -110,6 +117,7 @@ global.Runtime = {
 global.ATMAINS = [];
 
 function addAtMain(code) {
+  warn('use of legacy parseTools function: addAtMain');
   assert(HAS_MAIN, 'addAtMain called but program has no main function');
   ATMAINS.push(code);
 }

test/test_other.py

@@ -12947,7 +12947,8 @@ def test_no_cfi(self):
 
   @also_with_wasm_bigint
   def test_parseTools(self):
-    self.emcc_args += ['--js-library', test_file('other/test_parseTools.js')]
+    # Suppress js compiler warnings because we deliberately use legacy parseTools functions
+    self.emcc_args += ['-Wno-js-compiler', '--js-library', test_file('other/test_parseTools.js')]
     self.do_other_test('test_parseTools.c')
 
     # If we run ths same test with -sASSERTIONS=2 we expect it to fail because it