cfsolve 0.1.2 → 0.1.4
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 +22 -0
- data/README.md +8 -3
- 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 +14 -6
- 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/chrome-157-macos/answers.json +4777 -0
- data/lib/cfsolve/profiles/chrome-157-macos.json +613 -0
- 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/lib/cfsolve.rb +1 -1
- data/vendor/cfsolve/Cargo.lock +561 -1729
- data/vendor/cfsolve/Cargo.toml +26 -8
- data/vendor/cfsolve/README.md +57 -5
- 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/turnstile_smoke.rs +58 -0
- data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
- data/vendor/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
- data/vendor/cfsolve/profiles/chrome-157-macos.json +613 -0
- 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 +132 -24
- data/vendor/cfsolve/src/embedding_page/page.rs +41 -1
- 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 +12 -11
- data/vendor/cfsolve/src/session/probes.rs +1 -0
- 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/analyze.rs +33 -4
- data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
- data/vendor/cfsolve/src/stage2/analysis/discovery.rs +13 -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 +113 -41
- data/vendor/cfsolve/src/stage2/call_stack.rs +1564 -1041
- data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
- data/vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js +1 -0
- 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/dates.rs +44 -0
- data/vendor/cfsolve/src/stage2/probes/parent_info_array.rs +326 -0
- data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
- data/vendor/cfsolve/src/stage2/probes/stack.rs +117 -4
- data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +80 -2
- data/vendor/cfsolve/src/stage2/probes.rs +1 -0
- data/vendor/cfsolve/src/stage2/queries.rs +50 -0
- data/vendor/cfsolve/src/stage2/reference.rs +5 -0
- data/vendor/cfsolve/src/stage2/registry.rs +8 -2
- data/vendor/cfsolve/src/stage2/replay.rs +34 -3
- data/vendor/cfsolve/src/stage2/stylesheets.rs +35 -0
- data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
- data/vendor/cfsolve/src/stage2/trace.rs +134 -108
- data/vendor/cfsolve/src/stage2/value_labels.rs +185 -0
- data/vendor/cfsolve/src/stage2/vocabulary.rs +112 -17
- data/vendor/cfsolve/src/stage2.rs +3 -0
- data/vendor/cfsolve/src/vm/disassemble.rs +75 -7
- data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
- data/vendor/cfsolve/src/vm/encoded_names.rs +635 -0
- data/vendor/cfsolve/src/vm/extract.rs +550 -250
- data/vendor/cfsolve/src/vm/fixtures/free_functions/README.md +9 -0
- data/vendor/cfsolve/src/vm/fixtures/free_functions/machine.js +7438 -0
- data/vendor/cfsolve/src/vm/fixtures/free_functions/program.base64 +1 -0
- data/vendor/cfsolve/src/vm/interpret/access.rs +71 -50
- 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 +160 -58
- 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 +1765 -0
- data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
- data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +392 -0
- data/vendor/cfsolve/src/vm/interpret/run.rs +120 -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 +116 -51
- data/vendor/cfsolve/src/vm/output.rs +19 -6
- data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
- data/vendor/cfsolve/src/vm/registers.rs +35 -21
- data/vendor/cfsolve/src/vm/session.rs +189 -121
- data/vendor/cfsolve/src/vm/value.rs +22 -19
- data/vendor/cfsolve/src/vm.rs +3 -1
- data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
- data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
- metadata +106 -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
|
@@ -10,26 +10,30 @@ use std::collections::BTreeSet;
|
|
|
10
10
|
use std::rc::Rc;
|
|
11
11
|
|
|
12
12
|
use anyhow::{Context, Result, bail, ensure};
|
|
13
|
-
use
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
ObjectLit, SimpleAssignTarget, Stmt,
|
|
13
|
+
use oxc::ast::ast::{
|
|
14
|
+
AssignmentExpression, AssignmentTarget, BindingPattern, Expression, Function, MemberExpression,
|
|
15
|
+
ObjectExpression, Statement,
|
|
17
16
|
};
|
|
17
|
+
use oxc::semantic::SymbolId;
|
|
18
|
+
use oxc::syntax::operator::BinaryOperator;
|
|
18
19
|
|
|
19
20
|
use super::extract::{self, RunMethod};
|
|
20
|
-
use super::interpret::{self, Branching, Frozen, Intrinsics, Plans, Run, Spare};
|
|
21
|
+
use super::interpret::{self, Branching, Frozen, Intrinsics, Plans, Run, Spare, StringDecoder};
|
|
22
|
+
use super::machine::Definition;
|
|
21
23
|
use super::output::{Constant, Position, Term};
|
|
22
|
-
use super::registers::Member;
|
|
24
|
+
use super::registers::{Access, Member};
|
|
23
25
|
use super::value::Value;
|
|
24
26
|
use super::{HashMap, convert};
|
|
25
|
-
use crate::js::ast;
|
|
27
|
+
use crate::js::ast::{self, Binding, Script};
|
|
26
28
|
|
|
27
29
|
pub(crate) struct Session<'ast> {
|
|
30
|
+
/// The script defining the VM, which resolves its bindings.
|
|
31
|
+
pub script: Script<'ast>,
|
|
28
32
|
/// Functions declared beside the class: handlers and their helpers.
|
|
29
|
-
pub functions: HashMap<
|
|
33
|
+
pub functions: HashMap<SymbolId, &'ast Function<'ast>>,
|
|
30
34
|
/// Function values created lazily and shared across runs. Functions declared beside the
|
|
31
35
|
/// class capture no state that a run can change.
|
|
32
|
-
pub function_values: RefCell<HashMap<
|
|
36
|
+
pub function_values: RefCell<HashMap<SymbolId, Value<'ast>>>,
|
|
33
37
|
/// Lazily prepared handlers and helpers, including unsupported functions.
|
|
34
38
|
pub compiled: Plans<'ast>,
|
|
35
39
|
pub spare: RefCell<Spare<'ast>>,
|
|
@@ -37,19 +41,22 @@ pub(crate) struct Session<'ast> {
|
|
|
37
41
|
pub frozen: Frozen,
|
|
38
42
|
/// What exploration has learned about each handler's paths, by handler address.
|
|
39
43
|
pub branching: RefCell<HashMap<usize, Branching>>,
|
|
40
|
-
pub bindings: HashMap<
|
|
41
|
-
///
|
|
44
|
+
pub bindings: HashMap<Binding<'ast>, Value<'ast>>,
|
|
45
|
+
/// Bindings interrupted setup statements may have written, with their errors. Reading them
|
|
42
46
|
/// stops interpretation.
|
|
43
|
-
pub unavailable: HashMap<
|
|
47
|
+
pub unavailable: HashMap<Binding<'ast>, String>,
|
|
44
48
|
pub layout: Layout,
|
|
49
|
+
pub register_access: Access<'ast>,
|
|
45
50
|
/// Handler state: registers, register mask, and state-register indices.
|
|
46
51
|
pub state: HashMap<String, Value<'ast>>,
|
|
47
52
|
/// Initial register stacks created by the constructor for handler execution.
|
|
48
53
|
pub initial: Vec<(u8, Value<'ast>)>,
|
|
49
54
|
/// Function used to decrypt string records stored in registers.
|
|
50
|
-
pub record_decoder: Option<&'ast Function
|
|
55
|
+
pub record_decoder: Option<&'ast Function<'ast>>,
|
|
51
56
|
/// Script functions run natively.
|
|
52
57
|
pub intrinsics: Intrinsics,
|
|
58
|
+
/// The record decoder, run natively, if it has the recognized shape.
|
|
59
|
+
pub string_decoder: Option<StringDecoder<'ast>>,
|
|
53
60
|
/// The symbol the instance keeps its program under, if any.
|
|
54
61
|
pub program_key: Option<Rc<()>>,
|
|
55
62
|
/// Instance objects stored under the remaining symbols.
|
|
@@ -57,8 +64,9 @@ pub(crate) struct Session<'ast> {
|
|
|
57
64
|
/// Other fields the constructor initializes, including the string-hash cache that hashed
|
|
58
65
|
/// comparisons use.
|
|
59
66
|
pub fields: HashMap<String, Value<'ast>>,
|
|
60
|
-
constructor
|
|
61
|
-
|
|
67
|
+
/// The constructor's statements.
|
|
68
|
+
constructor: &'ast [Statement<'ast>],
|
|
69
|
+
pub handlers: HashMap<u8, &'ast Function<'ast>>,
|
|
62
70
|
/// Where the program runner starts a program.
|
|
63
71
|
pub entry: Position,
|
|
64
72
|
}
|
|
@@ -73,34 +81,34 @@ pub(crate) struct Layout {
|
|
|
73
81
|
}
|
|
74
82
|
|
|
75
83
|
impl<'ast> Session<'ast> {
|
|
76
|
-
/// Evaluates the
|
|
77
|
-
///
|
|
78
|
-
pub(super) fn try_new(
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
+
/// Evaluates the setup before and beside the VM class `definition` finds, then the
|
|
85
|
+
/// constructor.
|
|
86
|
+
pub(super) fn try_new(definition: &Definition<'ast>) -> Result<Self> {
|
|
87
|
+
let &Definition {
|
|
88
|
+
script,
|
|
89
|
+
body,
|
|
90
|
+
class,
|
|
91
|
+
ref prelude,
|
|
92
|
+
ref functions,
|
|
93
|
+
ref run,
|
|
94
|
+
..
|
|
95
|
+
} = definition;
|
|
84
96
|
let constructor = extract::constructor(class)?;
|
|
85
|
-
let
|
|
86
|
-
let
|
|
87
|
-
|
|
88
|
-
let record_decoder =
|
|
89
|
-
extract::record_decoder(body).and_then(|name| functions.get(&name).copied());
|
|
97
|
+
let handlers = extract::handlers(script, functions, &run.dispatch)?;
|
|
98
|
+
let record_decoder = extract::record_decoder(script, body, run.access)
|
|
99
|
+
.and_then(|symbol| functions.get(&symbol).copied());
|
|
90
100
|
let mut session = Self {
|
|
91
|
-
functions,
|
|
101
|
+
functions: functions.clone(),
|
|
92
102
|
handlers,
|
|
93
103
|
entry: extract::entry(body)?,
|
|
94
104
|
record_decoder,
|
|
95
|
-
|
|
105
|
+
register_access: run.access,
|
|
106
|
+
..Self::unevaluated(script, constructor)
|
|
96
107
|
};
|
|
97
|
-
(session.bindings, session.unavailable) =
|
|
108
|
+
(session.bindings, session.unavailable) =
|
|
109
|
+
interpret::setup(&session, prelude, &body.statements);
|
|
98
110
|
let constructed = construct(&mut Run::method(&session), constructor);
|
|
99
|
-
|
|
100
|
-
state: session.state,
|
|
101
|
-
layout: session.layout,
|
|
102
|
-
initial: session.initial,
|
|
103
|
-
} = state(&run, &constructed)?;
|
|
111
|
+
recover_state(&mut session, run, &constructed)?;
|
|
104
112
|
session.symbol_fields = constructed.objects;
|
|
105
113
|
session.program_key = match &constructed.programs[..] {
|
|
106
114
|
[] => None,
|
|
@@ -109,27 +117,31 @@ impl<'ast> Session<'ast> {
|
|
|
109
117
|
};
|
|
110
118
|
session.fields = concrete(constructed.fields);
|
|
111
119
|
session.intrinsics = interpret::intrinsics(&session);
|
|
120
|
+
session.string_decoder = StringDecoder::recognize(&session);
|
|
112
121
|
session.frozen = Frozen::of(&session.bindings);
|
|
113
122
|
Ok(session)
|
|
114
123
|
}
|
|
115
124
|
|
|
116
|
-
fn unevaluated(constructor: &'ast
|
|
125
|
+
fn unevaluated(script: Script<'ast>, constructor: &'ast [Statement<'ast>]) -> Self {
|
|
117
126
|
Self {
|
|
127
|
+
script,
|
|
118
128
|
functions: HashMap::default(),
|
|
119
129
|
function_values: RefCell::default(),
|
|
120
|
-
compiled:
|
|
130
|
+
compiled: Plans::default(),
|
|
121
131
|
spare: RefCell::default(),
|
|
122
132
|
frozen: Frozen::default(),
|
|
123
133
|
branching: RefCell::default(),
|
|
124
134
|
bindings: HashMap::default(),
|
|
125
135
|
unavailable: HashMap::default(),
|
|
126
136
|
layout: Layout::default(),
|
|
137
|
+
register_access: Access::default(),
|
|
127
138
|
state: HashMap::default(),
|
|
128
139
|
program_key: None,
|
|
129
140
|
symbol_fields: Vec::new(),
|
|
130
141
|
initial: Vec::new(),
|
|
131
142
|
record_decoder: None,
|
|
132
143
|
intrinsics: Intrinsics::default(),
|
|
144
|
+
string_decoder: None,
|
|
133
145
|
fields: HashMap::default(),
|
|
134
146
|
constructor,
|
|
135
147
|
handlers: HashMap::default(),
|
|
@@ -142,13 +154,31 @@ impl<'ast> Session<'ast> {
|
|
|
142
154
|
pub(super) fn constructed(&self, program: &[u8]) -> HashMap<String, Value<'ast>> {
|
|
143
155
|
concrete(construct(&mut Run::constructor(self, program), self.constructor).fields)
|
|
144
156
|
}
|
|
157
|
+
|
|
158
|
+
/// The function declared beside the class that `binding` refers to.
|
|
159
|
+
pub(crate) fn function(&self, binding: Binding<'ast>) -> Option<&'ast Function<'ast>> {
|
|
160
|
+
match binding {
|
|
161
|
+
Binding::Symbol(symbol) => self.functions.get(&symbol).copied(),
|
|
162
|
+
Binding::Global(_) => None,
|
|
163
|
+
}
|
|
164
|
+
}
|
|
145
165
|
}
|
|
146
166
|
|
|
147
167
|
#[cfg(test)]
|
|
148
|
-
impl Session<'
|
|
149
|
-
/// Creates an empty session for interpreter tests.
|
|
150
|
-
|
|
151
|
-
|
|
168
|
+
impl<'ast> Session<'ast> {
|
|
169
|
+
/// Creates an empty session over `script` for interpreter tests. Declares the script's
|
|
170
|
+
/// function declarations beside the class.
|
|
171
|
+
pub(crate) fn empty(script: Script<'ast>) -> Self {
|
|
172
|
+
Self {
|
|
173
|
+
functions: extract::functions(&script.program.body),
|
|
174
|
+
..Self::unevaluated(script, &[])
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/// The function the script declares as `name`.
|
|
179
|
+
pub(crate) fn declared(&self, name: &str) -> &'ast Function<'ast> {
|
|
180
|
+
let symbol = self.script.scoping.get_root_binding(name.into());
|
|
181
|
+
self.functions[&symbol.expect("the function is declared")]
|
|
152
182
|
}
|
|
153
183
|
}
|
|
154
184
|
|
|
@@ -177,13 +207,16 @@ struct RegisterWrite<'a> {
|
|
|
177
207
|
value: Value<'a>,
|
|
178
208
|
}
|
|
179
209
|
|
|
210
|
+
/// Locals holding copies of instance fields, by binding.
|
|
211
|
+
type Copies<'a> = HashMap<Binding<'a>, String>;
|
|
212
|
+
|
|
180
213
|
/// Evaluates object literal properties. Uses null for properties computed from program bytes, such
|
|
181
214
|
/// as the word array used by a faster string decoder. This makes handlers use byte-by-byte decoding
|
|
182
215
|
/// instead.
|
|
183
|
-
fn object_fields<'a>(run: &mut Run<'a, '_>, object: &'a
|
|
216
|
+
fn object_fields<'a>(run: &mut Run<'a, '_>, object: &'a ObjectExpression<'a>) -> Value<'a> {
|
|
184
217
|
let properties = ast::key_values(object)
|
|
185
218
|
.filter_map(|property| {
|
|
186
|
-
let name = ast::key_str(&property.key)?.to_owned();
|
|
219
|
+
let name = ast::key_str(&property.key, property.computed)?.to_owned();
|
|
187
220
|
let value = run
|
|
188
221
|
.expression(&property.value)
|
|
189
222
|
.ok()
|
|
@@ -197,43 +230,52 @@ fn object_fields<'a>(run: &mut Run<'a, '_>, object: &'a ObjectLit) -> Value<'a>
|
|
|
197
230
|
/// Evaluates constructor field assignments in order through `run`, including nested blocks. Follows
|
|
198
231
|
/// field copies through locals to find the source fields for the program counter and dispatch key
|
|
199
232
|
/// indices.
|
|
200
|
-
fn construct<'a>(run: &mut Run<'a, '_>, constructor: &'a
|
|
233
|
+
fn construct<'a>(run: &mut Run<'a, '_>, constructor: &'a [Statement<'a>]) -> Constructed<'a> {
|
|
201
234
|
let mut constructed = Constructed::default();
|
|
202
235
|
let mut copies = HashMap::default();
|
|
203
|
-
construct_statements(run,
|
|
236
|
+
construct_statements(run, constructor, &mut constructed, &mut copies);
|
|
204
237
|
constructed
|
|
205
238
|
}
|
|
206
239
|
|
|
207
240
|
fn construct_statements<'a>(
|
|
208
241
|
run: &mut Run<'a, '_>,
|
|
209
|
-
statements: &'a [
|
|
242
|
+
statements: &'a [Statement<'a>],
|
|
210
243
|
constructed: &mut Constructed<'a>,
|
|
211
|
-
copies: &mut
|
|
244
|
+
copies: &mut Copies<'a>,
|
|
212
245
|
) {
|
|
213
246
|
for statement in statements {
|
|
214
247
|
match statement {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
248
|
+
Statement::BlockStatement(block) => {
|
|
249
|
+
construct_statements(run, &block.body, constructed, copies);
|
|
250
|
+
}
|
|
251
|
+
Statement::ExpressionStatement(statement) => {
|
|
252
|
+
construct_expression(run, &statement.expression, constructed, copies);
|
|
218
253
|
}
|
|
219
254
|
// In `var copy = (local = this.field, this.other)`, `copy` receives the final operand,
|
|
220
255
|
// `this.other`.
|
|
221
|
-
|
|
222
|
-
for declarator in &declaration.
|
|
256
|
+
Statement::VariableDeclaration(declaration) if !declaration.kind.is_using() => {
|
|
257
|
+
for declarator in &declaration.declarations {
|
|
223
258
|
let Some(init) = &declarator.init else {
|
|
224
259
|
continue;
|
|
225
260
|
};
|
|
226
261
|
construct_expression(run, init, constructed, copies);
|
|
227
|
-
let
|
|
262
|
+
let BindingPattern::BindingIdentifier(name) = &declarator.id else {
|
|
228
263
|
continue;
|
|
229
264
|
};
|
|
230
|
-
let value = match init.
|
|
231
|
-
|
|
232
|
-
last.
|
|
265
|
+
let value = match init.without_parentheses() {
|
|
266
|
+
Expression::SequenceExpression(sequence)
|
|
267
|
+
if let Some(last) = sequence.expressions.last() =>
|
|
268
|
+
{
|
|
269
|
+
last.without_parentheses()
|
|
233
270
|
}
|
|
234
271
|
value => value,
|
|
235
272
|
};
|
|
236
|
-
track_copy(
|
|
273
|
+
track_copy(
|
|
274
|
+
run.source(),
|
|
275
|
+
Binding::Symbol(name.symbol_id()),
|
|
276
|
+
value,
|
|
277
|
+
copies,
|
|
278
|
+
);
|
|
237
279
|
}
|
|
238
280
|
}
|
|
239
281
|
_ => {}
|
|
@@ -244,27 +286,41 @@ fn construct_statements<'a>(
|
|
|
244
286
|
/// Visits assignments in `expr` in evaluation order, including sequence operands.
|
|
245
287
|
fn construct_expression<'a>(
|
|
246
288
|
run: &mut Run<'a, '_>,
|
|
247
|
-
expr: &'a
|
|
289
|
+
expr: &'a Expression<'a>,
|
|
248
290
|
constructed: &mut Constructed<'a>,
|
|
249
|
-
copies: &mut
|
|
291
|
+
copies: &mut Copies<'a>,
|
|
250
292
|
) {
|
|
251
293
|
match expr {
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
294
|
+
Expression::ParenthesizedExpression(paren) => {
|
|
295
|
+
construct_expression(run, &paren.expression, constructed, copies);
|
|
296
|
+
}
|
|
297
|
+
Expression::SequenceExpression(sequence) => {
|
|
298
|
+
for expr in &sequence.expressions {
|
|
255
299
|
construct_expression(run, expr, constructed, copies);
|
|
256
300
|
}
|
|
257
301
|
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
302
|
+
Expression::AssignmentExpression(assign) => {
|
|
303
|
+
construct_assignment(run, assign, constructed, copies);
|
|
304
|
+
}
|
|
305
|
+
Expression::CallExpression(call) => {
|
|
306
|
+
let (file, index, value) = match (ast::method_call(expr, "write"), &call.arguments[..])
|
|
307
|
+
{
|
|
308
|
+
(Some((file, _)), [index, value]) => (
|
|
309
|
+
file,
|
|
310
|
+
ast::argument_expression(index),
|
|
311
|
+
ast::argument_expression(value),
|
|
312
|
+
),
|
|
313
|
+
(None, [file, index, value]) => (
|
|
314
|
+
ast::argument_expression(file),
|
|
315
|
+
ast::argument_expression(index),
|
|
316
|
+
ast::argument_expression(value),
|
|
317
|
+
),
|
|
263
318
|
_ => return,
|
|
264
319
|
};
|
|
265
|
-
if let
|
|
266
|
-
&& let Some(
|
|
267
|
-
&& let
|
|
320
|
+
if let Expression::Identifier(file) = file
|
|
321
|
+
&& let Some(file) = copies.get(&run.source().binding(file))
|
|
322
|
+
&& let Some((mask, register)) = masked_index(run.source(), index, copies)
|
|
323
|
+
&& let Ok(value) = run.expression(value)
|
|
268
324
|
{
|
|
269
325
|
constructed.registers.push(RegisterWrite {
|
|
270
326
|
file: file.clone(),
|
|
@@ -280,13 +336,19 @@ fn construct_expression<'a>(
|
|
|
280
336
|
|
|
281
337
|
/// Extracts the mask field and register from `<mask> ^ <register>`. The mask can be a field access
|
|
282
338
|
/// or a local copy of one.
|
|
283
|
-
fn masked_index
|
|
284
|
-
|
|
285
|
-
|
|
339
|
+
fn masked_index<'a>(
|
|
340
|
+
script: Script<'a>,
|
|
341
|
+
index: &Expression<'a>,
|
|
342
|
+
copies: &Copies<'a>,
|
|
343
|
+
) -> Option<(String, u8)> {
|
|
344
|
+
let Expression::BinaryExpression(xor) = index.without_parentheses() else {
|
|
345
|
+
return None;
|
|
346
|
+
};
|
|
347
|
+
if xor.operator != BinaryOperator::BitwiseXOR {
|
|
286
348
|
return None;
|
|
287
349
|
}
|
|
288
|
-
let field = |expr: &
|
|
289
|
-
let register = |expr: &
|
|
350
|
+
let field = |expr: &Expression<'a>| copied_field(script, expr.without_parentheses(), copies);
|
|
351
|
+
let register = |expr: &Expression<'a>| convert::byte(ast::number(expr)?);
|
|
290
352
|
match (field(&xor.left), field(&xor.right)) {
|
|
291
353
|
(Some(mask), None) => Some((mask, register(&xor.right)?)),
|
|
292
354
|
(None, Some(mask)) => Some((mask, register(&xor.left)?)),
|
|
@@ -296,21 +358,29 @@ fn masked_index(index: &Expr, copies: &HashMap<Atom, String>) -> Option<(String,
|
|
|
296
358
|
|
|
297
359
|
fn construct_assignment<'a>(
|
|
298
360
|
run: &mut Run<'a, '_>,
|
|
299
|
-
assign: &'a
|
|
361
|
+
assign: &'a AssignmentExpression<'a>,
|
|
300
362
|
constructed: &mut Constructed<'a>,
|
|
301
|
-
copies: &mut
|
|
363
|
+
copies: &mut Copies<'a>,
|
|
302
364
|
) {
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
365
|
+
let script = run.source();
|
|
366
|
+
if let AssignmentTarget::AssignmentTargetIdentifier(name) = &assign.left {
|
|
367
|
+
track_copy(script, script.binding(name), &assign.right, copies);
|
|
368
|
+
return;
|
|
369
|
+
}
|
|
370
|
+
let Some(target) = assign.left.as_member_expression() else {
|
|
371
|
+
return;
|
|
372
|
+
};
|
|
373
|
+
match target.object() {
|
|
374
|
+
Expression::ThisExpression(_) => {
|
|
375
|
+
if let Some(field) = ast::member_str(target).map(str::to_owned) {
|
|
306
376
|
if let Ok(value) = run.expression(&assign.right) {
|
|
307
377
|
constructed.fields.insert(field, value);
|
|
308
378
|
}
|
|
309
|
-
} else if let
|
|
310
|
-
&& let Ok(Value::Symbol(symbol)) = run.expression(&
|
|
379
|
+
} else if let MemberExpression::ComputedMemberExpression(target) = target
|
|
380
|
+
&& let Ok(Value::Symbol(symbol)) = run.expression(&target.expression)
|
|
311
381
|
{
|
|
312
|
-
match
|
|
313
|
-
|
|
382
|
+
match &assign.right {
|
|
383
|
+
Expression::ObjectExpression(object) => {
|
|
314
384
|
let value = object_fields(run, object);
|
|
315
385
|
constructed.objects.push((symbol, value));
|
|
316
386
|
}
|
|
@@ -318,38 +388,41 @@ fn construct_assignment<'a>(
|
|
|
318
388
|
}
|
|
319
389
|
}
|
|
320
390
|
}
|
|
391
|
+
Expression::Super(_) => {}
|
|
321
392
|
// `registers.<index> = <copy of a field>`.
|
|
322
|
-
|
|
323
|
-
let field = copied_field(&assign.right, copies);
|
|
324
|
-
match ast::member_str(
|
|
393
|
+
_ => {
|
|
394
|
+
let field = copied_field(script, &assign.right, copies);
|
|
395
|
+
match ast::member_str(target).and_then(|name| run.register_access().member(name)) {
|
|
325
396
|
Some(Member::PcIndex) => constructed.pc = field,
|
|
326
397
|
Some(Member::KeyIndex) => constructed.key = field,
|
|
327
398
|
_ => {}
|
|
328
399
|
}
|
|
329
400
|
}
|
|
330
|
-
AssignTarget::Simple(SimpleAssignTarget::Ident(name)) => {
|
|
331
|
-
track_copy(&name.sym, &assign.right, copies);
|
|
332
|
-
}
|
|
333
|
-
_ => {}
|
|
334
401
|
}
|
|
335
402
|
}
|
|
336
403
|
|
|
337
|
-
/// Records the source field if assigning `value` makes local `
|
|
338
|
-
fn track_copy
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
404
|
+
/// Records the source field if assigning `value` makes local `binding` a copy of that field.
|
|
405
|
+
fn track_copy<'a>(
|
|
406
|
+
script: Script<'a>,
|
|
407
|
+
binding: Binding<'a>,
|
|
408
|
+
value: &Expression<'a>,
|
|
409
|
+
copies: &mut Copies<'a>,
|
|
410
|
+
) {
|
|
411
|
+
match copied_field(script, value, copies) {
|
|
412
|
+
Some(field) => copies.insert(binding, field),
|
|
413
|
+
None => copies.remove(&binding),
|
|
342
414
|
};
|
|
343
415
|
}
|
|
344
416
|
|
|
345
417
|
/// Resolves the field read by `expr`, either directly as `this.field` or through a local copy.
|
|
346
|
-
fn copied_field
|
|
418
|
+
fn copied_field<'a>(
|
|
419
|
+
script: Script<'a>,
|
|
420
|
+
expr: &Expression<'a>,
|
|
421
|
+
copies: &Copies<'a>,
|
|
422
|
+
) -> Option<String> {
|
|
347
423
|
match expr {
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
}
|
|
351
|
-
Expr::Ident(name) => copies.get(&name.sym).cloned(),
|
|
352
|
-
_ => None,
|
|
424
|
+
Expression::Identifier(name) => copies.get(&script.binding(name)).cloned(),
|
|
425
|
+
expr => extract::this_field(expr).map(str::to_owned),
|
|
353
426
|
}
|
|
354
427
|
}
|
|
355
428
|
|
|
@@ -359,17 +432,14 @@ fn concrete<'a>(mut fields: HashMap<String, Value<'a>>) -> HashMap<String, Value
|
|
|
359
432
|
fields
|
|
360
433
|
}
|
|
361
434
|
|
|
362
|
-
///
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
/// `this.<mask> ^ <register>` with a random mask per run. Uses zero for the mask during
|
|
371
|
-
/// analysis.
|
|
372
|
-
fn state<'a>(names: &RunMethod<'_>, constructed: &Constructed<'a>) -> Result<Recovered<'a>> {
|
|
435
|
+
/// Recovers the session's handler state, register layout, and initial register stacks. The
|
|
436
|
+
/// constructor computes indices as `this.<mask> ^ <register>` with a random mask per run. Uses
|
|
437
|
+
/// zero for the mask during analysis.
|
|
438
|
+
fn recover_state<'a>(
|
|
439
|
+
session: &mut Session<'a>,
|
|
440
|
+
names: &RunMethod<'_>,
|
|
441
|
+
constructed: &Constructed<'a>,
|
|
442
|
+
) -> Result<()> {
|
|
373
443
|
let fields = &constructed.fields;
|
|
374
444
|
let pc = constructed
|
|
375
445
|
.pc
|
|
@@ -408,7 +478,7 @@ fn state<'a>(names: &RunMethod<'_>, constructed: &Constructed<'a>) -> Result<Rec
|
|
|
408
478
|
// Keep external objects, such as the global object, dependent on their registers so listing
|
|
409
479
|
// readers can recognize how the program accesses them.
|
|
410
480
|
let state_registers = [layout.pc, layout.key, layout.program, layout.cells];
|
|
411
|
-
|
|
481
|
+
session.initial = constructed
|
|
412
482
|
.registers
|
|
413
483
|
.iter()
|
|
414
484
|
.filter(|write| {
|
|
@@ -420,11 +490,9 @@ fn state<'a>(names: &RunMethod<'_>, constructed: &Constructed<'a>) -> Result<Rec
|
|
|
420
490
|
.map(|write| (write.register, write.value.clone()))
|
|
421
491
|
.collect();
|
|
422
492
|
state.extend(mask.map(|mask| (mask, Value::Number(0.0))));
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
initial,
|
|
427
|
-
})
|
|
493
|
+
session.state = state;
|
|
494
|
+
session.layout = layout;
|
|
495
|
+
Ok(())
|
|
428
496
|
}
|
|
429
497
|
|
|
430
498
|
/// Extracts the register and optional mask field from `this.<mask> ^ <register>` or a bare
|
|
@@ -435,7 +503,7 @@ fn masked(value: &Value<'_>) -> Option<(Option<String>, u8)> {
|
|
|
435
503
|
Value::Symbolic(term) => &**term,
|
|
436
504
|
_ => return None,
|
|
437
505
|
};
|
|
438
|
-
let Term::Binary(
|
|
506
|
+
let Term::Binary(BinaryOperator::BitwiseXOR, left, right) = term else {
|
|
439
507
|
return None;
|
|
440
508
|
};
|
|
441
509
|
match (&**left, &**right) {
|
|
@@ -4,13 +4,13 @@ use std::cell::RefCell;
|
|
|
4
4
|
use std::mem;
|
|
5
5
|
use std::rc::Rc;
|
|
6
6
|
|
|
7
|
-
use
|
|
8
|
-
use swc_core::ecma::ast::{ArrowExpr, Function as ScriptFunction};
|
|
7
|
+
use oxc::ast::ast::{ArrowFunctionExpression, Function as ScriptFunction};
|
|
9
8
|
|
|
10
9
|
use super::interpret::Builtin;
|
|
11
10
|
use super::output::{Constant, Term};
|
|
12
11
|
use super::registers::Slots;
|
|
13
12
|
use super::{HashMap, convert};
|
|
13
|
+
use crate::js::ast::Binding;
|
|
14
14
|
|
|
15
15
|
/// A value produced by a handler. Uses a word-sized discriminant so the whole value occupies
|
|
16
16
|
/// two words.
|
|
@@ -48,10 +48,12 @@ pub(crate) enum Value<'ast> {
|
|
|
48
48
|
Cell(u32),
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
/// Variables of a call or of setup
|
|
52
|
-
///
|
|
51
|
+
/// Variables of a call or of setup, by binding: each declared variable by its symbol, and a
|
|
52
|
+
/// function's `arguments` or an undeclared variable a sloppy assignment creates by name. Functions
|
|
53
|
+
/// capture scopes by reference, so later assignments are visible to every function sharing the
|
|
54
|
+
/// scope.
|
|
53
55
|
pub(crate) struct Env<'ast> {
|
|
54
|
-
pub variables: HashMap<
|
|
56
|
+
pub variables: HashMap<Binding<'ast>, Value<'ast>>,
|
|
55
57
|
pub outer: Option<Scope<'ast>>,
|
|
56
58
|
}
|
|
57
59
|
|
|
@@ -59,34 +61,34 @@ pub(crate) type Scope<'ast> = Rc<RefCell<Env<'ast>>>;
|
|
|
59
61
|
|
|
60
62
|
impl<'ast> Env<'ast> {
|
|
61
63
|
pub(super) fn scope(
|
|
62
|
-
variables: HashMap<
|
|
64
|
+
variables: HashMap<Binding<'ast>, Value<'ast>>,
|
|
63
65
|
outer: Option<Scope<'ast>>,
|
|
64
66
|
) -> Scope<'ast> {
|
|
65
67
|
Rc::new(RefCell::new(Self { variables, outer }))
|
|
66
68
|
}
|
|
67
69
|
|
|
68
|
-
pub(super) fn find(scope: &RefCell<Self>,
|
|
70
|
+
pub(super) fn find(scope: &RefCell<Self>, binding: Binding<'ast>) -> Option<Value<'ast>> {
|
|
69
71
|
let scope = scope.borrow();
|
|
70
|
-
match scope.variables.get(
|
|
72
|
+
match scope.variables.get(&binding) {
|
|
71
73
|
Some(value) => Some(value.clone()),
|
|
72
|
-
None => Self::find(scope.outer.as_ref()?,
|
|
74
|
+
None => Self::find(scope.outer.as_ref()?, binding),
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
77
|
|
|
76
|
-
/// Assigns `
|
|
77
|
-
/// the
|
|
78
|
+
/// Assigns `binding` in the nearest scope containing it. Returns `value` if no scope
|
|
79
|
+
/// contains the binding.
|
|
78
80
|
pub(super) fn assign(
|
|
79
81
|
scope: &RefCell<Self>,
|
|
80
|
-
|
|
82
|
+
binding: Binding<'ast>,
|
|
81
83
|
value: Value<'ast>,
|
|
82
84
|
) -> Option<Value<'ast>> {
|
|
83
85
|
let mut scope = scope.borrow_mut();
|
|
84
|
-
if let Some(slot) = scope.variables.get_mut(
|
|
86
|
+
if let Some(slot) = scope.variables.get_mut(&binding) {
|
|
85
87
|
*slot = value;
|
|
86
88
|
return None;
|
|
87
89
|
}
|
|
88
90
|
match &scope.outer {
|
|
89
|
-
Some(outer) => Self::assign(outer,
|
|
91
|
+
Some(outer) => Self::assign(outer, binding, value),
|
|
90
92
|
None => Some(value),
|
|
91
93
|
}
|
|
92
94
|
}
|
|
@@ -94,8 +96,9 @@ impl<'ast> Env<'ast> {
|
|
|
94
96
|
|
|
95
97
|
pub(crate) enum Callable<'ast> {
|
|
96
98
|
Script {
|
|
97
|
-
name
|
|
98
|
-
|
|
99
|
+
/// The name calls to the function are recorded under.
|
|
100
|
+
name: Option<&'ast str>,
|
|
101
|
+
function: &'ast ScriptFunction<'ast>,
|
|
99
102
|
/// Scope captured at function creation. Functions declared beside the class use `None`
|
|
100
103
|
/// and resolve through setup or session bindings.
|
|
101
104
|
scope: Option<Scope<'ast>>,
|
|
@@ -103,7 +106,7 @@ pub(crate) enum Callable<'ast> {
|
|
|
103
106
|
/// Arrow function with captured `this` and scope. A copied function uses `None` when its
|
|
104
107
|
/// entire scope chain is empty.
|
|
105
108
|
Arrow {
|
|
106
|
-
arrow: &'ast
|
|
109
|
+
arrow: &'ast ArrowFunctionExpression<'ast>,
|
|
107
110
|
this: Value<'ast>,
|
|
108
111
|
scope: Option<Scope<'ast>>,
|
|
109
112
|
},
|
|
@@ -289,8 +292,8 @@ fn closure(callable: &Callable<'_>) -> Option<Term> {
|
|
|
289
292
|
// Use the factory's variables; its `arguments` also contains the machine and layout.
|
|
290
293
|
let scope = scope.borrow();
|
|
291
294
|
let variables = &scope.variables;
|
|
292
|
-
let mut layouts = variables.iter().filter_map(|(
|
|
293
|
-
Value::Array(layout) if
|
|
295
|
+
let mut layouts = variables.iter().filter_map(|(binding, value)| match value {
|
|
296
|
+
Value::Array(layout) if *binding != Binding::Global("arguments") => Some(layout),
|
|
294
297
|
_ => None,
|
|
295
298
|
});
|
|
296
299
|
let machine = variables
|
data/vendor/cfsolve/src/vm.rs
CHANGED
|
@@ -14,6 +14,7 @@ mod convert;
|
|
|
14
14
|
pub(crate) mod dataflow;
|
|
15
15
|
mod disassemble;
|
|
16
16
|
mod dispatch;
|
|
17
|
+
mod encoded_names;
|
|
17
18
|
mod extract;
|
|
18
19
|
mod interpret;
|
|
19
20
|
mod machine;
|
|
@@ -30,5 +31,6 @@ pub use output::{
|
|
|
30
31
|
Cause, Constant, Effect, Exit, Failure, Hidden, Instruction, Listing, Path, Position, Term,
|
|
31
32
|
};
|
|
32
33
|
|
|
33
|
-
/// FxHash maps for the VM's small keys.
|
|
34
|
+
/// FxHash maps and sets for the VM's small keys.
|
|
34
35
|
pub(crate) type HashMap<K, V> = rustc_hash::FxHashMap<K, V>;
|
|
36
|
+
pub(crate) type HashSet<T> = rustc_hash::FxHashSet<T>;
|