cfsolve 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/THIRD_PARTY_LICENSES/README.md +71 -254
- data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
- data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
- data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
- data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
- data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
- data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
- data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
- data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
- data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
- data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
- data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
- data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
- data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
- data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
- data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
- data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
- data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
- data/UPSTREAM.md +7 -5
- data/ext/cfsolve/Cargo.lock +534 -1727
- data/ext/cfsolve/Cargo.toml +4 -0
- data/ext/cfsolve/src/main.rs +1 -1
- data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
- data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
- data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
- data/lib/cfsolve/version.rb +2 -2
- data/vendor/cfsolve/Cargo.lock +561 -1729
- data/vendor/cfsolve/Cargo.toml +26 -8
- data/vendor/cfsolve/README.md +4 -0
- data/vendor/cfsolve/examples/check_answers.rs +2 -2
- data/vendor/cfsolve/examples/compare_session.rs +1 -2
- data/vendor/cfsolve/examples/solver_profile.rs +84 -0
- data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
- data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
- data/vendor/cfsolve/examples/tls_echo.rs +3 -3
- data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
- data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
- data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
- data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
- data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
- data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
- data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
- data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
- data/vendor/cfsolve/src/capture/proxy.rs +44 -13
- data/vendor/cfsolve/src/capture/sessions.rs +4 -3
- data/vendor/cfsolve/src/capture/upstream.rs +1 -1
- data/vendor/cfsolve/src/challenge/codec.rs +4 -2
- data/vendor/cfsolve/src/challenge/expression.rs +161 -117
- data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
- data/vendor/cfsolve/src/challenge/installed.rs +13 -6
- data/vendor/cfsolve/src/challenge/merge.rs +120 -80
- data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
- data/vendor/cfsolve/src/challenge/payload.rs +69 -31
- data/vendor/cfsolve/src/challenge/program.rs +197 -178
- data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
- data/vendor/cfsolve/src/challenge/source.rs +151 -96
- data/vendor/cfsolve/src/challenge/state.rs +180 -148
- data/vendor/cfsolve/src/challenge/tally.rs +64 -50
- data/vendor/cfsolve/src/challenge.rs +1 -0
- data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
- data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
- data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
- data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
- data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
- data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
- data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
- data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
- data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
- data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
- data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
- data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
- data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
- data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
- data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
- data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
- data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
- data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
- data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
- data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
- data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
- data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
- data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
- data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
- data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
- data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
- data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
- data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
- data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
- data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
- data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
- data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
- data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
- data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
- data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
- data/vendor/cfsolve/src/deobfuscate.rs +15 -11
- data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -18
- data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
- data/vendor/cfsolve/src/error.rs +40 -5
- data/vendor/cfsolve/src/fingerprint.rs +8 -2
- data/vendor/cfsolve/src/http/client.rs +7 -10
- data/vendor/cfsolve/src/http/requests.rs +2 -2
- data/vendor/cfsolve/src/js/ast.rs +479 -263
- data/vendor/cfsolve/src/lib.rs +1 -0
- data/vendor/cfsolve/src/listing/fold.rs +19 -9
- data/vendor/cfsolve/src/listing/query.rs +1 -47
- data/vendor/cfsolve/src/performance_clock.rs +20 -1
- data/vendor/cfsolve/src/profiling.rs +49 -0
- data/vendor/cfsolve/src/script.rs +35 -24
- data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
- data/vendor/cfsolve/src/session/channel.rs +2 -2
- data/vendor/cfsolve/src/session/initial.rs +5 -5
- data/vendor/cfsolve/src/session/sink.rs +26 -1
- data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
- data/vendor/cfsolve/src/session.rs +1 -1
- data/vendor/cfsolve/src/solver.rs +3 -1
- data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
- data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
- data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
- data/vendor/cfsolve/src/stage2/benchmark.rs +62 -31
- data/vendor/cfsolve/src/stage2/call_stack.rs +1415 -1025
- data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
- data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
- data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
- data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
- data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
- data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
- data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
- data/vendor/cfsolve/src/stage2/queries.rs +50 -0
- data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
- data/vendor/cfsolve/src/stage2/trace.rs +134 -108
- data/vendor/cfsolve/src/stage2/vocabulary.rs +1 -11
- data/vendor/cfsolve/src/stage2.rs +2 -0
- data/vendor/cfsolve/src/vm/disassemble.rs +7 -3
- data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
- data/vendor/cfsolve/src/vm/extract.rs +347 -250
- data/vendor/cfsolve/src/vm/interpret/access.rs +63 -48
- data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
- data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
- data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
- data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
- data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
- data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
- data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
- data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
- data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
- data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +123 -59
- data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
- data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
- data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
- data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
- data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
- data/vendor/cfsolve/src/vm/interpret/run.rs +116 -45
- data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
- data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
- data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
- data/vendor/cfsolve/src/vm/interpret.rs +9 -1
- data/vendor/cfsolve/src/vm/machine.rs +56 -49
- data/vendor/cfsolve/src/vm/output.rs +13 -5
- data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
- data/vendor/cfsolve/src/vm/session.rs +185 -120
- data/vendor/cfsolve/src/vm/value.rs +22 -19
- data/vendor/cfsolve/src/vm.rs +2 -1
- data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
- data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
- metadata +94 -178
- data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
- data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
- data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
- data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
- data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
- data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
- data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
- data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
- data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
- data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
- data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
- data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
- data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
- data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
- data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
- data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
- data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
- data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
- data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
- data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
- data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
- data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
- data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
- /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
- /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
- /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
|
@@ -2,97 +2,125 @@
|
|
|
2
2
|
//!
|
|
3
3
|
//! ```js
|
|
4
4
|
//! !0; void 0; (0, f)(x); (0, Date).now(); // becomes true; undefined; f(x); Date.now()
|
|
5
|
+
//! var z = 0; (z, f)(x); (z, o).p; // becomes f(x); o.p
|
|
5
6
|
//! ```
|
|
6
7
|
//!
|
|
7
|
-
//! Folds `!` and `void` only for effect-free literal operands. Unwraps
|
|
8
|
-
//!
|
|
9
|
-
//! simplifies
|
|
10
|
-
//!
|
|
8
|
+
//! Folds `!` and `void` only for effect-free literal operands. Unwraps inert callee sequences only
|
|
9
|
+
//! when the final value is an identifier other than `eval`, preserving call behavior. Also
|
|
10
|
+
//! simplifies inert sequences used for property access. A sequence is inert when its leading
|
|
11
|
+
//! operands are literals or reads of `var` and parameter bindings outside `with` statements: such
|
|
12
|
+
//! a read is initialized on entry, so it cannot throw, and no object can intercept it. New
|
|
13
|
+
//! `undefined` references resolve to the global binding.
|
|
11
14
|
|
|
12
|
-
use
|
|
13
|
-
ArrayLit, Bool, Callee, Expr, Lit, MemberExpr, ObjectLit, Program, UnaryExpr, UnaryOp,
|
|
14
|
-
};
|
|
15
|
-
use swc_core::ecma::visit::{VisitMut, VisitMutWith};
|
|
15
|
+
use std::mem;
|
|
16
16
|
|
|
17
|
-
use
|
|
17
|
+
use oxc::allocator::{CloneIn, GetAllocator};
|
|
18
|
+
use oxc::ast::ast::{CallExpression, Expression, MemberExpression, Program, WithStatement};
|
|
19
|
+
use oxc::ast_visit::{VisitMut, walk_mut};
|
|
20
|
+
use oxc::syntax::operator::UnaryOperator;
|
|
21
|
+
use oxc::syntax::symbol::SymbolFlags;
|
|
18
22
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
use super::analysis::Analysis;
|
|
24
|
+
use super::ast;
|
|
25
|
+
|
|
26
|
+
pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
|
|
27
|
+
let mut restore = Restore {
|
|
28
|
+
analysis,
|
|
29
|
+
within_with: false,
|
|
22
30
|
changed: false,
|
|
23
31
|
};
|
|
24
|
-
|
|
32
|
+
restore.visit_program(program);
|
|
25
33
|
restore.changed
|
|
26
34
|
}
|
|
27
35
|
|
|
28
|
-
struct
|
|
29
|
-
|
|
36
|
+
struct Restore<'b, 'a> {
|
|
37
|
+
analysis: &'b Analysis<'a>,
|
|
38
|
+
/// Whether the visited code is inside a `with` statement's body, where an object may
|
|
39
|
+
/// intercept reads of any name.
|
|
40
|
+
within_with: bool,
|
|
30
41
|
changed: bool,
|
|
31
42
|
}
|
|
32
43
|
|
|
33
|
-
impl
|
|
34
|
-
|
|
35
|
-
|
|
44
|
+
impl<'a> Restore<'_, 'a> {
|
|
45
|
+
/// Splits an inert sequence (see the module documentation) into its value and leading
|
|
46
|
+
/// operands.
|
|
47
|
+
fn inert_sequence<'b>(
|
|
48
|
+
&self,
|
|
49
|
+
expression: &'b Expression<'a>,
|
|
50
|
+
) -> Option<(&'b Expression<'a>, &'b [Expression<'a>])> {
|
|
51
|
+
let Expression::SequenceExpression(sequence) = expression.get_inner_expression() else {
|
|
52
|
+
return None;
|
|
53
|
+
};
|
|
54
|
+
let (last, prefix) = sequence.expressions.split_last()?;
|
|
55
|
+
prefix
|
|
56
|
+
.iter()
|
|
57
|
+
.all(|operand| self.is_inert(operand))
|
|
58
|
+
.then_some((last, prefix))
|
|
59
|
+
}
|
|
36
60
|
|
|
37
|
-
|
|
38
|
-
|
|
61
|
+
fn is_inert(&self, operand: &Expression<'_>) -> bool {
|
|
62
|
+
if operand.is_literal() {
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
let Expression::Identifier(reference) = operand.get_inner_expression() else {
|
|
66
|
+
return false;
|
|
67
|
+
};
|
|
68
|
+
!self.within_with
|
|
69
|
+
&& self
|
|
70
|
+
.analysis
|
|
71
|
+
.id(reference)
|
|
72
|
+
.and_then(|id| id.local())
|
|
73
|
+
.is_some_and(|symbol| {
|
|
74
|
+
self.analysis
|
|
75
|
+
.scoping
|
|
76
|
+
.symbol_flags(symbol)
|
|
77
|
+
.contains(SymbolFlags::FunctionScopedVariable)
|
|
78
|
+
})
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
impl<'a> VisitMut<'a> for Restore<'_, 'a> {
|
|
83
|
+
fn visit_expression(&mut self, expression: &mut Expression<'a>) {
|
|
84
|
+
walk_mut::walk_expression(self, expression);
|
|
85
|
+
if let Expression::UnaryExpression(unary) = expression
|
|
86
|
+
&& let Some(value) = ast::truthiness(&unary.argument)
|
|
39
87
|
{
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
|
|
88
|
+
let builder = &self.analysis.ast;
|
|
89
|
+
*expression = match unary.operator {
|
|
90
|
+
UnaryOperator::LogicalNot => {
|
|
91
|
+
Expression::new_boolean_literal(unary.span, !value, builder)
|
|
92
|
+
}
|
|
93
|
+
UnaryOperator::Void => Expression::new_identifier(unary.span, "undefined", builder),
|
|
46
94
|
_ => return,
|
|
47
95
|
};
|
|
48
96
|
self.changed = true;
|
|
49
97
|
}
|
|
50
98
|
}
|
|
51
99
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if let Callee::Expr(expression) = callee
|
|
59
|
-
&& let Expr::Seq(sequence) = expression.unwrap_parens_mut()
|
|
60
|
-
&& let [discarded @ .., last] = &sequence.exprs[..]
|
|
61
|
-
&& let Expr::Ident(name) = &**last
|
|
62
|
-
&& name.sym != "eval"
|
|
63
|
-
&& discarded.iter().all(|operand| operand.is_lit())
|
|
100
|
+
fn visit_call_expression(&mut self, call: &mut CallExpression<'a>) {
|
|
101
|
+
walk_mut::walk_call_expression(self, call);
|
|
102
|
+
if let Some((callee, _)) = self.inert_sequence(&call.callee)
|
|
103
|
+
&& let Expression::Identifier(identifier) = callee
|
|
104
|
+
&& identifier.name != "eval"
|
|
64
105
|
{
|
|
65
|
-
|
|
66
|
-
*expression = name;
|
|
106
|
+
call.callee = callee.clone_in_with_semantic_ids(self.analysis.allocator());
|
|
67
107
|
self.changed = true;
|
|
68
108
|
}
|
|
69
109
|
}
|
|
70
110
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
member.
|
|
74
|
-
|
|
75
|
-
if let Expr::Seq(sequence) = member.obj.unwrap_parens_mut()
|
|
76
|
-
&& let [discarded @ .., _] = &sequence.exprs[..]
|
|
77
|
-
&& discarded.iter().all(|operand| operand.is_lit())
|
|
78
|
-
{
|
|
79
|
-
member.obj = sequence.exprs.pop().expect("the sequence is not empty");
|
|
111
|
+
fn visit_member_expression(&mut self, member: &mut MemberExpression<'a>) {
|
|
112
|
+
walk_mut::walk_member_expression(self, member);
|
|
113
|
+
if let Some((object, [_, ..])) = self.inert_sequence(member.object()) {
|
|
114
|
+
*member.object_mut() = object.clone_in_with_semantic_ids(self.analysis.allocator());
|
|
80
115
|
self.changed = true;
|
|
81
116
|
}
|
|
82
117
|
}
|
|
83
|
-
}
|
|
84
118
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
Expr::Lit(Lit::Bool(boolean)) => Some(boolean.value),
|
|
91
|
-
Expr::Lit(Lit::Null(_)) => Some(false),
|
|
92
|
-
Expr::Array(ArrayLit { elems, .. }) if elems.is_empty() => Some(true),
|
|
93
|
-
Expr::Object(ObjectLit { props, .. }) if props.is_empty() => Some(true),
|
|
94
|
-
Expr::Paren(paren) => literal_truthiness(&paren.expr),
|
|
95
|
-
_ => None,
|
|
119
|
+
fn visit_with_statement(&mut self, statement: &mut WithStatement<'a>) {
|
|
120
|
+
self.visit_expression(&mut statement.object);
|
|
121
|
+
let within_with = mem::replace(&mut self.within_with, true);
|
|
122
|
+
self.visit_statement(&mut statement.body);
|
|
123
|
+
self.within_with = within_with;
|
|
96
124
|
}
|
|
97
125
|
}
|
|
98
126
|
|
|
@@ -102,31 +130,52 @@ mod tests {
|
|
|
102
130
|
|
|
103
131
|
#[test]
|
|
104
132
|
fn restores_literals_and_direct_calls() {
|
|
105
|
-
let transform = |source: &str| testing::rewrite(source, super::run
|
|
133
|
+
let transform = |source: &str| testing::rewrite(source, super::run);
|
|
106
134
|
let output =
|
|
107
135
|
transform("function f() { return [!0, !1, !2, !'', !'a', !null, !![], !{}]; }");
|
|
108
136
|
testing::assert_contains(
|
|
109
137
|
&output,
|
|
110
|
-
&[],
|
|
111
138
|
&["true, false, false, true, false, true, true, false"],
|
|
112
139
|
);
|
|
113
140
|
assert!(!output.contains('!'), "{output}");
|
|
114
141
|
assert_eq!(transform(&output), output);
|
|
115
142
|
let output = transform("function f(x) { x = void 0; return x === void 0 ? void 1 : x; }");
|
|
116
143
|
let expected = ["x = undefined;", "x === undefined ? undefined : x"];
|
|
117
|
-
testing::assert_contains(&output, &expected
|
|
144
|
+
testing::assert_contains(&output, &expected);
|
|
118
145
|
assert!(!output.contains("void"), "{output}");
|
|
119
146
|
// Operands that may have effects stay.
|
|
120
147
|
let output = transform("function f(x) { return [!x, !f(), !x.y, void f(), void x]; }");
|
|
121
|
-
testing::assert_contains(&output, &["!x", "!f()", "!x.y", "void f()", "void x"]
|
|
148
|
+
testing::assert_contains(&output, &["!x", "!f()", "!x.y", "void f()", "void x"]);
|
|
122
149
|
assert!(!output.contains("undefined"), "{output}");
|
|
123
150
|
// Indirect calls of names other than `eval` become direct.
|
|
124
151
|
let output = transform("function f(g, o) { (0, g)(this, 1); (0, o.m)(); (0, eval)('x'); }");
|
|
125
|
-
testing::assert_contains(&output, &["g(this, 1);", "(0, o.m)();", "(0, eval)("]
|
|
152
|
+
testing::assert_contains(&output, &["g(this, 1);", "(0, o.m)();", "(0, eval)("]);
|
|
126
153
|
// A property access uses the final value of the sequence as its object.
|
|
127
154
|
let output = transform(
|
|
128
155
|
"function f(o) { return [(0, Date).now(), (1, o).p, (0, o.a).push(1), (g(), o).q]; }",
|
|
129
156
|
);
|
|
130
|
-
testing::assert_contains(&output, &[
|
|
157
|
+
testing::assert_contains(&output, &["Date.now(), o.p, o.a.push(1), (g(), o).q"]);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
#[test]
|
|
161
|
+
fn drops_reads_of_var_and_parameter_bindings_from_sequences() {
|
|
162
|
+
let output = testing::rewrite(
|
|
163
|
+
"function f(z, o, g) {
|
|
164
|
+
var y = 0;
|
|
165
|
+
let l = 0;
|
|
166
|
+
const c = 0;
|
|
167
|
+
use((z, g)(1), (y, o).p, (y, z, o).q, (l, g)(2), (c, o).r, (u, g)(3),
|
|
168
|
+
(y, o.m)(4), (y, eval)('x'));
|
|
169
|
+
with (o) { use((y, g)(5), (y, o).s); }
|
|
170
|
+
}",
|
|
171
|
+
super::run,
|
|
172
|
+
);
|
|
173
|
+
testing::assert_contains(
|
|
174
|
+
&output,
|
|
175
|
+
&[
|
|
176
|
+
"g(1), o.p, o.q, (l, g)(2), (c, o).r, (u, g)(3), (y, o.m)(4), (y, eval)(\"x\")",
|
|
177
|
+
"use((y, g)(5), (y, o).s);",
|
|
178
|
+
],
|
|
179
|
+
);
|
|
131
180
|
}
|
|
132
181
|
}
|
|
@@ -4,58 +4,58 @@
|
|
|
4
4
|
//! for (; test; effect(), i++); // becomes for (; test; i++) { effect(); }
|
|
5
5
|
//! ```
|
|
6
6
|
//!
|
|
7
|
-
//!
|
|
8
|
-
//!
|
|
7
|
+
//! Moves the leading update operands into an empty body, leaving the final operand in the
|
|
8
|
+
//! header. The body must be empty so those evaluations still run at the same point in each
|
|
9
|
+
//! iteration. A loop with no initializer or update becomes `while`; an absent test means `true`.
|
|
9
10
|
|
|
10
|
-
use
|
|
11
|
-
|
|
12
|
-
use
|
|
13
|
-
use swc_core::ecma::visit::{VisitMut, VisitMutWith};
|
|
11
|
+
use oxc::allocator::{TakeIn, Vec};
|
|
12
|
+
use oxc::ast::ast::{Expression, Program, Statement};
|
|
13
|
+
use oxc::ast_visit::{VisitMut, walk_mut};
|
|
14
14
|
|
|
15
15
|
use super::analysis::Analysis;
|
|
16
|
-
use
|
|
16
|
+
use super::ast;
|
|
17
17
|
|
|
18
|
-
pub(super) fn run(program: &mut Program
|
|
19
|
-
let mut
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
|
|
19
|
+
let mut loops = Loops {
|
|
20
|
+
analysis,
|
|
21
|
+
changed: false,
|
|
22
|
+
};
|
|
23
|
+
loops.visit_program(program);
|
|
24
|
+
loops.changed
|
|
22
25
|
}
|
|
23
26
|
|
|
24
|
-
struct
|
|
27
|
+
struct Loops<'b, 'a> {
|
|
28
|
+
analysis: &'b Analysis<'a>,
|
|
25
29
|
changed: bool,
|
|
26
30
|
}
|
|
27
31
|
|
|
28
|
-
impl VisitMut for
|
|
29
|
-
fn
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
let Stmt::For(loop_statement) = statement else {
|
|
32
|
+
impl<'a> VisitMut<'a> for Loops<'_, 'a> {
|
|
33
|
+
fn visit_statement(&mut self, statement: &mut Statement<'a>) {
|
|
34
|
+
walk_mut::walk_statement(self, statement);
|
|
35
|
+
let builder = &self.analysis.ast;
|
|
36
|
+
let Statement::ForStatement(for_statement) = statement else {
|
|
34
37
|
return;
|
|
35
38
|
};
|
|
36
|
-
if
|
|
37
|
-
&& let Some(
|
|
38
|
-
&& let
|
|
39
|
-
&& let Some(last) = sequence.exprs.pop()
|
|
39
|
+
if matches!(for_statement.body, Statement::EmptyStatement(_))
|
|
40
|
+
&& let Some(Expression::SequenceExpression(sequence)) = &mut for_statement.update
|
|
41
|
+
&& let Some(last) = sequence.expressions.pop()
|
|
40
42
|
{
|
|
41
|
-
let effects =
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
let effects = sequence
|
|
44
|
+
.expressions
|
|
45
|
+
.drain(..)
|
|
46
|
+
.map(|effect| ast::expression_statement(effect, builder));
|
|
47
|
+
let effects = Vec::from_iter_in(effects, builder);
|
|
48
|
+
for_statement.body =
|
|
49
|
+
Statement::new_block_statement(for_statement.span, effects, builder);
|
|
50
|
+
for_statement.update = Some(last);
|
|
46
51
|
self.changed = true;
|
|
47
52
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
let
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
.test
|
|
55
|
-
.take()
|
|
56
|
-
.unwrap_or_else(|| Box::new(Expr::Lit(Lit::Bool(Bool { span, value: true })))),
|
|
57
|
-
body: loop_statement.body.take(),
|
|
58
|
-
});
|
|
53
|
+
if for_statement.init.is_none() && for_statement.update.is_none() {
|
|
54
|
+
let span = for_statement.span;
|
|
55
|
+
let test = for_statement.test.take();
|
|
56
|
+
let test = test.unwrap_or_else(|| Expression::new_boolean_literal(span, true, builder));
|
|
57
|
+
let body = for_statement.body.take_in(builder);
|
|
58
|
+
*statement = Statement::new_while_statement(span, test, body, builder);
|
|
59
59
|
self.changed = true;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -67,17 +67,17 @@ mod tests {
|
|
|
67
67
|
|
|
68
68
|
#[test]
|
|
69
69
|
fn restores_loop_bodies_and_while_loops() {
|
|
70
|
-
let transform = |source: &str| testing::rewrite(source, super::run
|
|
70
|
+
let transform = |source: &str| testing::rewrite(source, super::run);
|
|
71
71
|
let output = transform("for (var i = 0; i < n; use(i), tick(), i++);");
|
|
72
|
-
assert!(output.contains("for(var i = 0; i < n; i++)"), "{output}");
|
|
73
|
-
testing::assert_contains(&output, &[
|
|
72
|
+
assert!(output.contains("for (var i = 0; i < n; i++)"), "{output}");
|
|
73
|
+
testing::assert_contains(&output, &["use(i); tick();"]);
|
|
74
74
|
let output = transform("for (; ready; use(i), i++) work();");
|
|
75
75
|
assert!(
|
|
76
|
-
output.contains("for(; ready; use(i), i++)"),
|
|
76
|
+
output.contains("for (; ready; use(i), i++)"),
|
|
77
77
|
"only an empty body takes the effects: {output}"
|
|
78
78
|
);
|
|
79
79
|
let output = transform("for (;;) tick(); for (; ready;) work(); for (; ready; step());");
|
|
80
80
|
let expected = ["while(true)", "while(ready)", "for(; ready; step())"];
|
|
81
|
-
testing::assert_contains(&output, &expected
|
|
81
|
+
testing::assert_contains(&output, &expected);
|
|
82
82
|
}
|
|
83
83
|
}
|