Skip to content

Commit 4967c54

Browse files
authored
Simplify emitDCEGraph code for calling acorn optmimzer. NFC (#25558)
Instead of manual formatting we can just use `json.dumps`.
1 parent a0a3e20 commit 4967c54

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/building.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ def acorn_optimizer(filename, passes, extra_info=None, return_output=False, work
365365
temp = temp_files.get('.js', prefix='emcc_acorn_info_').name
366366
shutil.copyfile(filename, temp)
367367
with open(temp, 'a') as f:
368-
f.write('// EXTRA_INFO: ' + extra_info)
368+
f.write('// EXTRA_INFO: ' + json.dumps(extra_info))
369369
filename = temp
370370
cmd = config.NODE_JS + [optimizer, filename] + passes
371371
if not worker_js:
@@ -812,7 +812,7 @@ def metadce(js_file, wasm_file, debug_info, last):
812812
# Ignore exported wasm globals. Those get inlined directly into the JS code.
813813
exports = sorted(set(settings.WASM_EXPORTS) - set(settings.DATA_EXPORTS))
814814

815-
extra_info = '{ "exports": [' + ','.join(f'["{asmjs_mangle(x)}", "{x}"]' for x in exports) + ']}'
815+
extra_info = {"exports": [[asmjs_mangle(x), x] for x in exports]}
816816

817817
txt = acorn_optimizer(js_file, ['emitDCEGraph', '--no-print'], return_output=True, extra_info=extra_info)
818818
if shared.SKIP_SUBPROCS:
@@ -904,7 +904,7 @@ def metadce(js_file, wasm_file, debug_info, last):
904904
logger.debug("unused_imports: %s", str(unused_imports))
905905
logger.debug("unused_exports: %s", str(unused_exports))
906906
extra_info = {'unusedImports': unused_imports, 'unusedExports': unused_exports}
907-
return acorn_optimizer(js_file, passes, extra_info=json.dumps(extra_info))
907+
return acorn_optimizer(js_file, passes, extra_info=extra_info)
908908

909909

910910
def minify_wasm_imports_and_exports(js_file, wasm_file, minify_exports, debug_info):
@@ -940,7 +940,7 @@ def minify_wasm_imports_and_exports(js_file, wasm_file, minify_exports, debug_in
940940
if settings.MINIFICATION_MAP:
941941
lines = [f'{new}:{old}' for old, new in mapping.items()]
942942
utils.write_file(settings.MINIFICATION_MAP, '\n'.join(lines) + '\n')
943-
return acorn_optimizer(js_file, passes, extra_info=json.dumps(extra_info))
943+
return acorn_optimizer(js_file, passes, extra_info=extra_info)
944944

945945

946946
def wasm2js(js_file, wasm_file, opt_level, use_closure_compiler, debug_info, symbols_file=None, symbols_file_js=None):

0 commit comments

Comments
 (0)