From e90406542e8c44ae29ecf6e319c5fce05c059f3f Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Tue, 19 May 2026 16:57:11 -0700 Subject: [PATCH] Remove extra_info argument from js_optimizer.py. NFC This had no users. The only user of `run_on_file` is `run_js_optimizer` which doesn't pass this argument. --- tools/js_optimizer.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index aa905554e83e1..8a402f7ff7068 100755 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -149,7 +149,7 @@ def chunkify(funcs, chunk_size): @ToolchainProfiler.profile_block('js_optimizer.run_on_file') -def run_on_file(filename, passes, extra_info=None): +def run_on_file(filename, passes): with ToolchainProfiler.profile_block('js_optimizer.split_markers'): if not isinstance(passes, list): passes = [passes] @@ -227,11 +227,6 @@ def check_symbol_mapping(p): minify_info = minifier.serialize() - if extra_info: - for key, value in extra_info.items(): - assert key not in minify_info or value == minify_info[key], [key, value, minify_info[key]] - minify_info[key] = value - # if DEBUG: # print >> sys.stderr, 'minify info:', minify_info @@ -256,16 +251,13 @@ def check_symbol_mapping(p): print('chunkification: num funcs:', len(funcs), 'actual num chunks:', len(chunks), 'chunk size range:', max(lengths), '-', min(lengths), file=sys.stderr) funcs = None - serialized_extra_info = '' + serialized_minify_info = '' if minify_globals: - assert not extra_info - serialized_extra_info += '// EXTRA_INFO:' + json.dumps(minify_info) - elif extra_info: - serialized_extra_info += '// EXTRA_INFO:' + json.dumps(extra_info) + serialized_minify_info += '// EXTRA_INFO:' + json.dumps(minify_info) with ToolchainProfiler.profile_block('js_optimizer.write_chunks'): def write_chunk(chunk, i): temp_file = temp_files.get('.jsfunc_%d.js' % i).name - utils.write_file(temp_file, chunk + serialized_extra_info) + utils.write_file(temp_file, chunk + serialized_minify_info) return temp_file filenames = [write_chunk(chunk, i) for i, chunk in enumerate(chunks)] @@ -349,13 +341,7 @@ def write_chunk(chunk, i): def main(): - last = sys.argv[-1] - if '{' in last: - extra_info = json.loads(last) - sys.argv = sys.argv[:-1] - else: - extra_info = None - out = run_on_file(sys.argv[1], sys.argv[2:], extra_info=extra_info) + out = run_on_file(sys.argv[1], sys.argv[2:]) shutil.copyfile(out, sys.argv[1] + '.jsopt.js') return 0