Merge branch 'main' into cw-audio-memory64

Author: cwoffenden

emcc.py

@@ -183,6 +183,13 @@ def __init__(self):
     self.dash_S = False
     self.dash_M = False
     self.input_language = None
+    self.nostdlib = False
+    self.nostdlibxx = False
+    self.nodefaultlibs = False
+    self.nolibc = False
+    self.nostartfiles = False
+    self.sanitize_minimal_runtime = False
+    self.sanitize = set()
 
 
 def create_reproduce_file(name, args):
@@ -973,8 +980,8 @@ def compile_source_file(i, input_file):
       if get_file_suffix(input_file) in ['.pcm']:
         cmd = [c for c in cmd if not c.startswith('-fprebuilt-module-path=')]
     cmd += compile_args + ['-c', input_file, '-o', output_file]
-    if state.mode == Mode.COMPILE_AND_LINK and options.requested_debug == '-gsplit-dwarf':
-      # When running in COMPILE_AND_LINK mode we compile to temporary location
+    if options.requested_debug == '-gsplit-dwarf':
+      # When running in COMPILE_AND_LINK mode we compile objects to a temporary location
       # but we want the `.dwo` file to be generated in the current working directory,
       # like it is under clang.  We could avoid this hack if we use the clang driver
       # to generate the temporary files, but that would also involve using the clang
@@ -1421,6 +1428,22 @@ def consume_arg_file():
       # SSEx is implemented on top of SIMD128 instruction set, but do not pass SSE flags to LLVM
       # so it won't think about generating native x86 SSE code.
       newargs[i] = ''
+    elif arg == '-nostdlib':
+      options.nostdlib = True
+    elif arg == '-nostdlibxx':
+      options.nostdlibxx = True
+    elif arg == '-nodefaultlibs':
+      options.nodefaultlibs = True
+    elif arg == '-nolibc':
+      options.nolibc = True
+    elif arg == '-nostartfiles':
+      options.nostartfiles = True
+    elif arg == '-fsanitize-minimal-runtime':
+      options.sanitize_minimal_runtime = True
+    elif arg.startswith('-fsanitize='):
+      options.sanitize.update(arg.split('=', 1)[1].split(','))
+    elif arg.startswith('-fno-sanitize='):
+      options.sanitize.difference_update(arg.split('=', 1)[1].split(','))
     elif arg and (arg == '-' or not arg.startswith('-')):
       options.input_files.append(arg)
 

eslint.config.mjs

@@ -59,7 +59,6 @@ export default [{
     'src/proxyWorker.js',
     'src/proxyClient.js',
     'src/IDBStore.js',
-    'src/URIUtils.js',
     'tools/experimental',
   ],
 }, ...compat.extends('prettier'), js.configs.recommended, {
@@ -90,11 +89,8 @@ export default [{
   files: ['**/*.mjs'],
 
   rules: {
-    'no-undef': 'error',
     'no-unused-vars': ['error', {
-      vars: 'all',
-      args: 'none',
-      ignoreRestSiblings: false,
+      argsIgnorePattern: '^_',
       destructuredArrayIgnorePattern: '^_',
     }],
   },

src/URIUtils.js

@@ -51,7 +51,7 @@ function mangleCSymbolName(f) {
   if (f === '__main_argc_argv') {
     f = 'main';
   }
-  return f[0] == '$' ? f.substr(1) : '_' + f;
+  return f[0] == '$' ? f.slice(1) : '_' + f;
 }
 
 // Splits out items that pass filter. Returns also the original sans the filtered
@@ -112,7 +112,7 @@ function resolveAlias(symbol) {
   return symbol;
 }
 
-function getTransitiveDeps(symbol, debug) {
+function getTransitiveDeps(symbol) {
   // TODO(sbc): Use some kind of cache to avoid quadratic behaviour here.
   const transitiveDeps = new Set();
   const seen = new Set();
@@ -284,7 +284,7 @@ ${argConversions}
 
     // apply LIBRARY_DEBUG if relevant
     if (LIBRARY_DEBUG && !isJsOnlySymbol(symbol)) {
-      snippet = modifyJSFunction(snippet, (args, body, async, oneliner) => {
+      snippet = modifyJSFunction(snippet, (args, body, _async, oneliner) => {
         var run_func;
         if (oneliner) {
           run_func = `var ret = ${body}`;
@@ -637,7 +637,7 @@ function(${args}) {
         //  emits
         //   'var foo = [value];'
         if (typeof snippet == 'string' && snippet[0] == '=') {
-          snippet = snippet.substr(1);
+          snippet = snippet.slice(1);
         }
         contentText = `var ${mangled} = ${snippet};`;
       }

src/jsifier.mjs

@@ -334,7 +334,7 @@ if (!BOOTSTRAPPING_STRUCT_INFO) {
 // Use proxy objects for C_DEFINES and C_STRUCTS so that we can give useful
 // error messages.
 const C_STRUCTS = new Proxy(structs, {
-  get(target, prop, receiver) {
+  get(target, prop) {
     if (!(prop in target)) {
       throw new Error(
         `Missing C struct ${prop}! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)`,
@@ -345,7 +345,7 @@ const C_STRUCTS = new Proxy(structs, {
 });
 
 const C_DEFINES = new Proxy(defines, {
-  get(target, prop, receiver) {
+  get(target, prop) {
     if (!(prop in target)) {
       throw new Error(
         `Missing C define ${prop}! If you just added it to struct_info.json, you need to run ./tools/maint/gen_struct_info.py (then run a second time with --wasm64)`,
@@ -374,7 +374,7 @@ function getUnusedLibrarySymbols() {
   for (const [ident, value] of Object.entries(LibraryManager.library)) {
     if (typeof value === 'function' || typeof value === 'number') {
       if (isJsOnlySymbol(ident) && !isDecorator(ident) && !isInternalSymbol(ident)) {
-        const name = ident.substr(1);
+        const name = ident.slice(1);
         if (!librarySymbolSet.has(name)) {
           missingSyms.add(name);
         }
@@ -492,7 +492,7 @@ function exportRuntime() {
   let runtimeElementsSet = new Set(runtimeElements);
   for (const ident of Object.keys(LibraryManager.library)) {
     if (isJsOnlySymbol(ident) && !isDecorator(ident) && !isInternalSymbol(ident)) {
-      const jsname = ident.substr(1);
+      const jsname = ident.slice(1);
       // Note that this assertion may be hit when a function is moved into the
       // JS library. In that case the function should be removed from the list
       // of runtime elements above.

src/modules.mjs

@@ -141,9 +141,9 @@ export function preprocess(filename) {
           showStack.push(truthy ? SHOW : IGNORE);
         } else if (first === '#include') {
           if (showCurrentLine()) {
-            let includeFile = line.substr(line.indexOf(' ') + 1);
+            let includeFile = line.slice(line.indexOf(' ') + 1);
             if (includeFile.startsWith('"')) {
-              includeFile = includeFile.substr(1, includeFile.length - 2);
+              includeFile = includeFile.slice(1, -1);
             }
             const absPath = findIncludeFile(includeFile, path.dirname(filename));
             if (!absPath) {
@@ -214,7 +214,7 @@ no matching #endif found (${showStack.length$}' unmatched preprocessing directiv
 }
 
 // Returns true if ident is a niceIdent (see toNiceIdent). Also allow () and spaces.
-function isNiceIdent(ident, loose) {
+function isNiceIdent(ident) {
   return /^\(?[$_]+[\w$_\d ]*\)?$/.test(ident);
 }
 
@@ -328,7 +328,7 @@ function getNativeTypeSize(type) {
         return POINTER_SIZE;
       }
       if (type[0] === 'i') {
-        const bits = Number(type.substr(1));
+        const bits = Number(type.slice(1));
         assert(bits % 8 === 0, `getNativeTypeSize invalid bits ${bits}, ${type} type`);
         return bits / 8;
       }
@@ -360,7 +360,7 @@ function ensureDot(value) {
   if (value.includes('.') || /[IN]/.test(value)) return value;
   const e = value.indexOf('e');
   if (e < 0) return value + '.0';
-  return value.substr(0, e) + '.0' + value.substr(e);
+  return value.slice(0, e) + '.0' + value.slice(e);
 }
 
 export function isNumber(x) {
@@ -406,7 +406,7 @@ function asmFloatToInt(x) {
 }
 
 // See makeSetValue
-function makeGetValue(ptr, pos, type, noNeedFirst, unsigned, ignore, align) {
+function makeGetValue(ptr, pos, type, noNeedFirst, unsigned, _ignore, align) {
   assert(typeof align === 'undefined', 'makeGetValue no longer supports align parameter');
   assert(
     typeof noNeedFirst === 'undefined',
@@ -551,7 +551,7 @@ function getFastValue(a, op, b) {
 
   if (b[0] === '-') {
     op = '-';
-    b = b.substr(1);
+    b = b.slice(1);
   }
 
   return `(${a})${op}(${b})`;
@@ -785,14 +785,14 @@ export function modifyJSFunction(text, func) {
   if (match) {
     async_ = match[1] || '';
     args = match[3];
-    rest = text.substr(match[0].length);
+    rest = text.slice(match[0].length);
   } else {
     // Match an arrow function
     let match = text.match(/^\s*(var (\w+) = )?(async\s+)?\(([^)]*)\)\s+=>\s+/);
     if (match) {
       async_ = match[3] || '';
       args = match[4];
-      rest = text.substr(match[0].length);
+      rest = text.slice(match[0].length);
       rest = rest.trim();
       oneliner = rest[0] != '{';
     } else {
@@ -802,7 +802,7 @@ export function modifyJSFunction(text, func) {
       assert(match, `could not match function:\n${text}\n`);
       async_ = match[1] || '';
       args = match[2];
-      rest = text.substr(match[0].length);
+      rest = text.slice(match[0].length);
     }
   }
   let body = rest;
@@ -970,7 +970,7 @@ function from64(x) {
 
 // Like from64 above but generate an expression instead of an assignment
 // statement.
-function from64Expr(x, assign = true) {
+function from64Expr(x) {
   if (!MEMORY64) return x;
   return `Number(${x})`;
 }

src/parseTools.mjs

@@ -140,7 +140,20 @@ var runtimeInitialized = false;
 var runtimeExited = false;
 #endif
 
-#include "URIUtils.js"
+// Prefix of data URIs emitted by SINGLE_FILE and related options.
+var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+/**
+ * Indicates whether filename is a base64 data URI.
+ * @noinline
+ */
+var isDataURI = (filename) => filename.startsWith(dataURIPrefix);
+
+/**
+ * Indicates whether filename is delivered via file protocol (as opposed to http/https)
+ * @noinline
+ */
+var isFileURI = (filename) => filename.startsWith('file://');
 
 #include "runtime_shared.js"
 

src/preamble.js

@@ -792,6 +792,7 @@ def parameterize(func, parameters):
   test functions.
   """
   prev = getattr(func, '_parameterize', None)
+  assert not any(p.startswith('_') for p in parameters)
   if prev:
     # If we're parameterizing 2nd time, construct a cartesian product for various combinations.
     func._parameterize = {
@@ -1333,21 +1334,19 @@ def verify_es5(self, filename):
       self.fail('es-check failed to verify ES5 output compliance')
 
   # Build JavaScript code from source code
-  def build(self, filename, libraries=None, includes=None, force_c=False, js_outfile=True, emcc_args=None, output_basename=None):
+  def build(self, filename, libraries=None, includes=None, force_c=False, output_suffix='.js', emcc_args=None, output_basename=None):
     if not os.path.exists(filename):
       filename = test_file(filename)
-    suffix = '.js' if js_outfile else '.wasm'
     compiler = [compiler_for(filename, force_c)]
 
     if force_c:
       assert shared.suffix(filename) != '.c', 'force_c is not needed for source files ending in .c'
       compiler.append('-xc')
 
     if output_basename:
-      output = output_basename + suffix
+      output = output_basename + output_suffix
     else:
-      basename = os.path.basename(filename)
-      output = shared.unsuffixed(basename) + suffix
+      output = shared.unsuffixed_basename(filename) + output_suffix
     cmd = compiler + [filename, '-o', output] + self.get_emcc_args(main_file=True)
     if emcc_args:
       cmd += emcc_args

test/common.py

@@ -1 +1 @@
-129211
+129155

test/other/codesize/test_codesize_cxx_ctors1.size

@@ -1 +1 @@
-128623
+128567