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.
Files changed (368) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/THIRD_PARTY_LICENSES/README.md +71 -254
  4. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  5. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  6. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  7. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  8. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  9. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  11. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  12. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  13. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  14. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  15. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  16. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  17. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  18. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  19. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  21. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  22. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  24. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  30. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  32. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  34. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  36. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  38. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  40. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  42. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  43. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  45. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  47. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  49. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  51. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  53. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  55. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  56. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  57. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  58. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  59. data/UPSTREAM.md +7 -5
  60. data/ext/cfsolve/Cargo.lock +534 -1727
  61. data/ext/cfsolve/Cargo.toml +4 -0
  62. data/ext/cfsolve/src/main.rs +1 -1
  63. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  64. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  65. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  66. data/lib/cfsolve/version.rb +2 -2
  67. data/vendor/cfsolve/Cargo.lock +561 -1729
  68. data/vendor/cfsolve/Cargo.toml +26 -8
  69. data/vendor/cfsolve/README.md +4 -0
  70. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  71. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  72. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  73. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  74. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  75. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  76. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  77. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  78. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  79. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  80. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  81. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  82. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  83. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  84. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  85. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  86. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  87. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  88. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  89. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  90. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  91. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  92. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  93. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  94. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  95. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  96. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  97. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  98. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  99. data/vendor/cfsolve/src/challenge.rs +1 -0
  100. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  101. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  102. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  103. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  104. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  105. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  106. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  107. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  108. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  109. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  110. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  111. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  112. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  113. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  114. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  115. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  116. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  117. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  118. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  119. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  120. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  121. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  122. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  123. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  124. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  125. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  126. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  127. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  128. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  129. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  130. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  131. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  132. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  133. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  134. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  135. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  136. data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -18
  137. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  138. data/vendor/cfsolve/src/error.rs +40 -5
  139. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  140. data/vendor/cfsolve/src/http/client.rs +7 -10
  141. data/vendor/cfsolve/src/http/requests.rs +2 -2
  142. data/vendor/cfsolve/src/js/ast.rs +479 -263
  143. data/vendor/cfsolve/src/lib.rs +1 -0
  144. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  145. data/vendor/cfsolve/src/listing/query.rs +1 -47
  146. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  147. data/vendor/cfsolve/src/profiling.rs +49 -0
  148. data/vendor/cfsolve/src/script.rs +35 -24
  149. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  150. data/vendor/cfsolve/src/session/channel.rs +2 -2
  151. data/vendor/cfsolve/src/session/initial.rs +5 -5
  152. data/vendor/cfsolve/src/session/sink.rs +26 -1
  153. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  154. data/vendor/cfsolve/src/session.rs +1 -1
  155. data/vendor/cfsolve/src/solver.rs +3 -1
  156. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  157. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  158. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  159. data/vendor/cfsolve/src/stage2/benchmark.rs +62 -31
  160. data/vendor/cfsolve/src/stage2/call_stack.rs +1415 -1025
  161. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  162. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  163. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  164. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  165. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  166. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  167. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  168. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  169. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  170. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  171. data/vendor/cfsolve/src/stage2/vocabulary.rs +1 -11
  172. data/vendor/cfsolve/src/stage2.rs +2 -0
  173. data/vendor/cfsolve/src/vm/disassemble.rs +7 -3
  174. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  175. data/vendor/cfsolve/src/vm/extract.rs +347 -250
  176. data/vendor/cfsolve/src/vm/interpret/access.rs +63 -48
  177. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  178. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  179. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  180. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  181. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  182. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  183. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  184. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  185. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  186. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +123 -59
  187. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  188. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  189. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
  190. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  191. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
  192. data/vendor/cfsolve/src/vm/interpret/run.rs +116 -45
  193. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  194. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  195. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  196. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  197. data/vendor/cfsolve/src/vm/machine.rs +56 -49
  198. data/vendor/cfsolve/src/vm/output.rs +13 -5
  199. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  200. data/vendor/cfsolve/src/vm/session.rs +185 -120
  201. data/vendor/cfsolve/src/vm/value.rs +22 -19
  202. data/vendor/cfsolve/src/vm.rs +2 -1
  203. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  204. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  205. metadata +94 -178
  206. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  207. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  208. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  209. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  210. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  211. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  212. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  213. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  214. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  215. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  216. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  217. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  218. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  219. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  220. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  221. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  222. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  223. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  224. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  225. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  226. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  227. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  228. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  229. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  230. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  231. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  232. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  233. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  234. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  235. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  237. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  238. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  239. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  240. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  241. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  242. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  243. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  244. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  245. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  246. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  247. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  248. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  249. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  250. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  251. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  252. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  253. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  255. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  256. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  257. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  258. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  259. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  260. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  261. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  262. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  263. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  264. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  265. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  266. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  268. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  269. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  270. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  271. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  272. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  273. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  274. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  277. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  278. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  279. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  280. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  281. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  282. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  283. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  284. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  286. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  288. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  289. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  290. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  291. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  292. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  293. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  294. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  295. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  296. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  297. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  298. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  299. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  300. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  301. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  302. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  303. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  305. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  329. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  330. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  331. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  332. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  333. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  334. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  335. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  336. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  337. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  338. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  339. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  340. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  341. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  342. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  343. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  344. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  345. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  346. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  347. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  348. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  349. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  350. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  351. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  352. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  353. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  354. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  355. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  356. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  357. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  358. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  359. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  360. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  361. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  362. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  363. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  364. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  365. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  366. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  367. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  368. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -1,24 +1,28 @@
1
- //! Compiles slot plans into closures. Compiled code takes the same steps as
2
- //! [`super::evaluate`] takes over a plan, in the same order and through the same [`Run`]
3
- //! methods, but resolves each node's kind and operands once, when the plan is compiled.
1
+ //! Compiles plans into closures, which resolve each node's kind and operands once, when the
2
+ //! plan is compiled.
4
3
  //!
5
- //! A few common shapes run more directly: assignments to locals in statement position skip
6
- //! the result they would discard, and arithmetic reads program bytes at local indexes, as in
7
- //! `program[pc++]`, without building values.
4
+ //! A few common shapes in slot plans run more directly: assignments to locals in statement
5
+ //! position skip the result they would discard, and arithmetic reads program bytes at local
6
+ //! indexes, as in `program[pc++]`, without building values.
8
7
 
9
8
  use std::cell::RefCell;
9
+ use std::mem;
10
10
  use std::rc::Rc;
11
11
 
12
- use swc_core::ecma::ast::{BinaryOp, UpdateOp};
12
+ use oxc::syntax::operator::{BinaryOperator, UpdateOperator};
13
13
 
14
14
  use super::access::{self, Key};
15
- use super::evaluate::{self, Locals, Location, MAXIMUM_ITERATIONS};
15
+ use super::evaluate::{self, Locals, Location};
16
16
  use super::plan::{Case, Declaration, Expression, Name, Property, Statement, Target};
17
17
  use super::run::{Evaluation, Flow, Run, Stop};
18
18
  use super::semantics;
19
19
  use crate::vm::convert;
20
20
  use crate::vm::value::Value;
21
21
 
22
+ /// Maximum handler loop count. Valid constants require fewer iterations; exceeding it indicates
23
+ /// invalid instruction bytes.
24
+ const MAXIMUM_ITERATIONS: usize = 1 << 16;
25
+
22
26
  /// Compiled code producing `T`.
23
27
  type Compiled<'ast, T> = Box<
24
28
  dyn for<'session> Fn(&mut Run<'ast, 'session>, &mut Locals<'ast>) -> Evaluation<'ast, T> + 'ast,
@@ -30,8 +34,7 @@ pub(super) type Code<'ast> = Compiled<'ast, Flow<'ast>>;
30
34
  /// A compiled expression.
31
35
  type Compute<'ast> = Compiled<'ast, Value<'ast>>;
32
36
 
33
- /// A compiled operand of arithmetic, as [`Run::number`] evaluates it: a number, or the value
34
- /// of a nonnumeric operand.
37
+ /// A compiled operand of arithmetic: a number, or the value of a nonnumeric operand.
35
38
  type Numeric<'ast> = Compiled<'ast, Result<f64, Value<'ast>>>;
36
39
 
37
40
  /// Compiles a function body or block.
@@ -39,7 +42,7 @@ pub(super) fn statements<'ast>(statements: &[Statement<'ast>]) -> Vec<Code<'ast>
39
42
  statements.iter().map(statement).collect()
40
43
  }
41
44
 
42
- /// Runs statements in order until one jumps, as `Run::execute_all` does.
45
+ /// Runs statements in order until one jumps.
43
46
  pub(super) fn run_all<'ast>(
44
47
  code: &[Code<'ast>],
45
48
  run: &mut Run<'ast, '_>,
@@ -54,7 +57,7 @@ pub(super) fn run_all<'ast>(
54
57
  Ok(Flow::Normal)
55
58
  }
56
59
 
57
- fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
60
+ pub(super) fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
58
61
  match statement {
59
62
  Statement::Switch(discriminant, cases) => switch(discriminant, cases),
60
63
  Statement::Empty => code(|_, _| Ok(Flow::Normal)),
@@ -71,14 +74,25 @@ fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
71
74
  let handler = handler.as_deref().map(statements);
72
75
  let finalizer = finalizer.as_deref().map(statements);
73
76
  code(move |run, locals| {
74
- run.attempt(
75
- block.as_slice(),
76
- parameter,
77
- handler.as_deref(),
78
- finalizer.as_deref(),
79
- locals,
80
- |run, code, locals| run_all(code, run, locals),
81
- )
77
+ let mut outcome = run_all(&block, run, locals);
78
+ if let Some(handler) = &handler
79
+ && let Err(stop) = &mut outcome
80
+ && let Stop::Throw(exception) = &mut **stop
81
+ {
82
+ let exception = mem::replace(exception, Value::Undefined);
83
+ if let Some(parameter) = parameter {
84
+ run.bind(parameter, exception, locals);
85
+ }
86
+ outcome = run_all(handler, run, locals);
87
+ }
88
+ // A jump from `finally` overrides the previous completion of the block.
89
+ if let Some(finalizer) = &finalizer {
90
+ match run_all(finalizer, run, locals)? {
91
+ Flow::Normal => {}
92
+ flow => return Ok(flow),
93
+ }
94
+ }
95
+ outcome
82
96
  })
83
97
  }
84
98
  Statement::Block(block) => {
@@ -107,15 +121,15 @@ fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
107
121
  code(move |run, locals| Err(Stop::throw(expression(run, locals)?)))
108
122
  }
109
123
  Statement::Break(label) => {
110
- let label = label.cloned();
111
- code(move |_, _| Ok(Flow::Break(label.clone())))
124
+ let label = *label;
125
+ code(move |_, _| Ok(Flow::Break(label)))
112
126
  }
113
127
  Statement::Continue(label) => {
114
- let label = label.cloned();
115
- code(move |_, _| Ok(Flow::Continue(label.clone())))
128
+ let label = *label;
129
+ code(move |_, _| Ok(Flow::Continue(label)))
116
130
  }
117
131
  Statement::Label(label, body) => {
118
- let label = (*label).clone();
132
+ let label = *label;
119
133
  let body = self::statement(body);
120
134
  code(move |run, locals| {
121
135
  Ok(match body(run, locals)? {
@@ -136,8 +150,7 @@ fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
136
150
  let test = test.as_ref().map(compute);
137
151
  let update = update.as_ref().map(compute);
138
152
  let body = self::statement(body);
139
- let body_first = *body_first;
140
- let label = label.cloned();
153
+ let (body_first, label) = (*body_first, *label);
141
154
  code(move |run, locals| {
142
155
  if let Some(init) = &init {
143
156
  init(run, locals)?;
@@ -153,7 +166,7 @@ fn statement<'ast>(statement: &Statement<'ast>) -> Code<'ast> {
153
166
  first = false;
154
167
  match body(run, locals)? {
155
168
  Flow::Normal | Flow::Continue(None) => {}
156
- Flow::Continue(Some(target)) if Some(&target) == label.as_ref() => {}
169
+ Flow::Continue(Some(target)) if Some(target) == label => {}
157
170
  Flow::Break(None) => return Ok(Flow::Normal),
158
171
  flow => return Ok(flow),
159
172
  }
@@ -193,7 +206,14 @@ fn declare<'ast>(declarations: &[Declaration<'ast>]) -> Code<'ast> {
193
206
  for (name, init, keeps) in &declarations {
194
207
  let value = match init {
195
208
  Some(init) => init(run, locals)?,
196
- None if *keeps && run.declared(*name, locals) => continue,
209
+ None if *keeps
210
+ && match *name {
211
+ Name::Local(slot, _) => locals[slot].is_some(),
212
+ Name::Scoped(binding) => run.frame().declares(binding),
213
+ } =>
214
+ {
215
+ continue;
216
+ }
197
217
  None => Value::Undefined,
198
218
  };
199
219
  run.bind(*name, value, locals);
@@ -300,7 +320,7 @@ impl<'ast> Arguments<'ast> {
300
320
  Self(arguments.iter().map(compute).collect())
301
321
  }
302
322
 
303
- /// Evaluates the arguments into a reused buffer, as `Run::arguments` does.
323
+ /// Evaluates the arguments into a reused buffer.
304
324
  fn values(
305
325
  &self,
306
326
  run: &mut Run<'ast, '_>,
@@ -314,7 +334,7 @@ impl<'ast> Arguments<'ast> {
314
334
  }
315
335
  }
316
336
 
317
- fn compute<'ast>(expression: &Expression<'ast>) -> Compute<'ast> {
337
+ pub(super) fn compute<'ast>(expression: &Expression<'ast>) -> Compute<'ast> {
318
338
  match expression {
319
339
  Expression::Constant(value) => {
320
340
  let value = value.clone();
@@ -328,9 +348,9 @@ fn compute<'ast>(expression: &Expression<'ast>) -> Compute<'ast> {
328
348
  None => run.lookup(name),
329
349
  })
330
350
  }
331
- Expression::Name(Name::Global(name)) => {
332
- let name = *name;
333
- code(move |run, _| run.lookup(name))
351
+ Expression::Name(Name::Scoped(binding)) => {
352
+ let binding = *binding;
353
+ code(move |run, _| run.lookup(binding))
334
354
  }
335
355
  Expression::This => code(|run, _| Ok(run.frame().this.clone())),
336
356
  Expression::Binary(operator, left, right) => {
@@ -356,18 +376,32 @@ fn compute<'ast>(expression: &Expression<'ast>) -> Compute<'ast> {
356
376
  })
357
377
  }
358
378
  Expression::Assign(target, operator, right) => assignment(target, *operator, right),
379
+ Expression::LogicalAssign(target) => {
380
+ let target = Located::new(target);
381
+ code(move |run, locals| {
382
+ target.locate(run, locals)?;
383
+ Err(Stop::unsupported("a logical assignment"))
384
+ })
385
+ }
359
386
  Expression::Update {
360
387
  target,
361
388
  operator,
362
389
  prefix,
363
390
  } => update(target, *operator, *prefix),
364
391
  Expression::Call(callee, arguments) => call(callee, arguments),
392
+ // `&&`, `||`, or `??`, evaluating the right side only when needed.
365
393
  Expression::Logical {
366
394
  operator,
367
395
  left,
368
396
  right,
369
397
  pure,
370
- } => logical(*operator, left, right, *pure),
398
+ } => {
399
+ let (operator, pure, left, right) = (*operator, *pure, compute(left), compute(right));
400
+ code(move |run, locals| {
401
+ let left = left(run, locals)?;
402
+ run.short_circuit(operator, left, pure, locals, &right)
403
+ })
404
+ }
371
405
  Expression::Sequence(expressions) => {
372
406
  let expressions: Vec<_> = expressions.iter().map(compute).collect();
373
407
  code(move |run, locals| {
@@ -432,8 +466,8 @@ fn compute<'ast>(expression: &Expression<'ast>) -> Compute<'ast> {
432
466
  })
433
467
  }
434
468
  Expression::Function(name, function) => {
435
- let (name, function) = (name.cloned(), *function);
436
- code(move |run, _| Ok(run.function_value(name.clone(), function)))
469
+ let (name, function) = (*name, *function);
470
+ code(move |run, _| Ok(run.function_value(name, function)))
437
471
  }
438
472
  Expression::Arrow(arrow) => {
439
473
  let arrow = *arrow;
@@ -453,10 +487,8 @@ fn call<'ast>(callee: &Expression<'ast>, arguments: &[Expression<'ast>]) -> Comp
453
487
  let (object, property) = (compute(object), Keyed::new(property));
454
488
  code(move |run, locals| {
455
489
  let object = object(run, locals)?;
456
- let callee = {
457
- let key = property.key(run, locals)?;
458
- run.get(&object, &key)?
459
- };
490
+ let key = property.key(run, locals)?;
491
+ let callee = run.get(&object, &key)?;
460
492
  let arguments = arguments.values(run, locals)?;
461
493
  run.apply(callee, object, arguments)
462
494
  })
@@ -474,7 +506,7 @@ fn call<'ast>(callee: &Expression<'ast>, arguments: &[Expression<'ast>]) -> Comp
474
506
 
475
507
  fn assignment<'ast>(
476
508
  target: &Target<'ast>,
477
- operator: Option<BinaryOp>,
509
+ operator: Option<BinaryOperator>,
478
510
  right: &Expression<'ast>,
479
511
  ) -> Compute<'ast> {
480
512
  let (target, right) = (Located::new(target), compute(right));
@@ -487,12 +519,12 @@ fn assignment<'ast>(
487
519
  }),
488
520
  Some(operator) => code(move |run, locals| {
489
521
  let location = target.locate(run, locals)?;
490
- run.compound(location, operator, locals, |run, locals| right(run, locals))
522
+ run.compound(location, operator, locals, &right)
491
523
  }),
492
524
  }
493
525
  }
494
526
 
495
- fn update<'ast>(target: &Target<'ast>, operator: UpdateOp, prefix: bool) -> Compute<'ast> {
527
+ fn update<'ast>(target: &Target<'ast>, operator: UpdateOperator, prefix: bool) -> Compute<'ast> {
496
528
  let target = Located::new(target);
497
529
  code(move |run, locals| {
498
530
  // A counter: the local is read and written in place.
@@ -506,24 +538,9 @@ fn update<'ast>(target: &Target<'ast>, operator: UpdateOp, prefix: bool) -> Comp
506
538
  })
507
539
  }
508
540
 
509
- /// `&&`, `||`, or `??`, evaluating the right side only when needed.
510
- fn logical<'ast>(
511
- operator: BinaryOp,
512
- left: &Expression<'ast>,
513
- right: &Expression<'ast>,
514
- pure: bool,
515
- ) -> Compute<'ast> {
516
- let (left, right) = (compute(left), compute(right));
517
- code(move |run, locals| {
518
- let left = left(run, locals)?;
519
- run.short_circuit(operator, left, pure, locals, |run, locals| {
520
- right(run, locals)
521
- })
522
- })
523
- }
524
-
525
- /// Numeric evaluation, as [`Run::number`] does: arithmetic without wrapping intermediate
526
- /// results, switching to general evaluation where an operand is nonnumeric.
541
+ /// Evaluates numeric arithmetic without wrapping intermediate results. If an operand is
542
+ /// nonnumeric, switches to general evaluation for that operator and its enclosing operators,
543
+ /// reusing evaluated operands, and returns that general result in `Err`.
527
544
  fn number<'ast>(expression: &Expression<'ast>) -> Numeric<'ast> {
528
545
  let Expression::Arithmetic {
529
546
  operator,
@@ -73,7 +73,7 @@ trait Copier<'ast>: Sized {
73
73
  // The function captures no mutable state.
74
74
  None => return value.clone(),
75
75
  scope => Callable::Script {
76
- name: name.clone(),
76
+ name: *name,
77
77
  function,
78
78
  scope,
79
79
  },
@@ -176,7 +176,7 @@ impl<'ast> Copier<'ast> for Isolation<'_, '_, 'ast> {
176
176
  let variables = original
177
177
  .variables
178
178
  .iter()
179
- .map(|(name, value)| (name.clone(), self.copy(value)))
179
+ .map(|(name, value)| (*name, self.copy(value)))
180
180
  .collect();
181
181
  *copied.borrow_mut() = Env { variables, outer };
182
182
  Some(copied)
@@ -1,23 +1,21 @@
1
1
  //! Compares slot plans with scoped plans by running every tested function both ways.
2
2
 
3
- use swc_core::atoms::Atom;
4
- use swc_core::ecma::ast::BinaryOp;
3
+ use oxc::syntax::operator::BinaryOperator;
5
4
 
6
- use crate::js::ast;
7
- use crate::vm::interpret::plan::FunctionPlan;
5
+ use crate::js::ast::{Binding, ParsedScript, Script};
6
+ use crate::vm::disassemble;
7
+ use crate::vm::interpret::plan::{FunctionPlan, Name, Routine};
8
8
  use crate::vm::interpret::run::Stop;
9
9
  use crate::vm::interpret::{Run, semantics};
10
10
  use crate::vm::output::{Effect, Position, Term};
11
11
  use crate::vm::session::{Layout, Session};
12
12
  use crate::vm::value::{Callable, Value};
13
- use crate::vm::{disassemble, extract};
14
13
 
15
14
  #[test]
16
15
  fn concrete_register_stack_keeps_its_exception_continuation() {
17
- let parsed = ast::parse_iframe_javascript("function f(stack) { stack.push([42, 9, [], 0]); }")
16
+ let parsed = ParsedScript::parse("t", "function f(stack) { stack.push([42, 9, [], 0]); }")
18
17
  .expect("the source parses");
19
- let mut session = Session::empty();
20
- session.functions = extract::functions(&parsed.script.body);
18
+ let mut session = Session::empty(parsed.script());
21
19
  session.layout = Layout {
22
20
  pc: 240,
23
21
  key: 241,
@@ -31,7 +29,7 @@ fn concrete_register_stack_keeps_its_exception_continuation() {
31
29
  run.registers.insert(7, stack.clone());
32
30
  let function = Callable::Script {
33
31
  name: None,
34
- function: session.functions[&Atom::from("f")],
32
+ function: session.declared("f"),
35
33
  scope: None,
36
34
  };
37
35
  let result = run.invoke(&function, Value::Undefined, vec![stack]);
@@ -56,15 +54,12 @@ fn compare(
56
54
  decisions: Vec<bool>,
57
55
  slots: bool,
58
56
  ) -> String {
59
- // Leak the script text so arguments can be prepared before parsing it.
60
- let parsed: &_ = Box::leak(Box::new(ast::parse_iframe_javascript(source).unwrap()));
61
- let mut session = Session::empty();
62
- session.functions = extract::functions(&parsed.script.body);
63
- let function = session.functions.get(&Atom::from("f")).unwrap();
64
- assert_eq!(FunctionPlan::compile(function).is_some(), slots, "{source}");
57
+ assert_eq!(plan_of(source).is_some(), slots, "{source}");
58
+ let mut session = Session::empty(parse(source));
59
+ let function = session.declared("f");
65
60
  session
66
61
  .bindings
67
- .insert(Atom::from("outer"), Value::Number(17.0));
62
+ .insert(Binding::Global("outer"), Value::Number(17.0));
68
63
  let execute = |disabled| {
69
64
  session.compiled.disabled.set(disabled);
70
65
  let mut run = Run::method(&session);
@@ -89,7 +84,7 @@ fn compare(
89
84
  let mut globals: Vec<_> = run
90
85
  .globals
91
86
  .iter()
92
- .map(|(name, value)| (name.to_string(), format!("{:?}", value.expr())))
87
+ .map(|(binding, value)| (session.script.name(*binding), format!("{:?}", value.expr())))
93
88
  .collect();
94
89
  globals.sort();
95
90
  format!(
@@ -102,6 +97,35 @@ fn compare(
102
97
  outcome
103
98
  }
104
99
 
100
+ /// Parses `source`, leaking it so values can be prepared before parsing.
101
+ fn parse(source: &str) -> Script<'static> {
102
+ let parsed = ParsedScript::parse("t", source).expect("the source parses");
103
+ Box::leak(Box::new(parsed)).script()
104
+ }
105
+
106
+ /// The slot plan of the function `f` that `source` declares, if it has one.
107
+ fn plan_of(source: &str) -> Option<FunctionPlan<'static>> {
108
+ let script = parse(source);
109
+ let function = Session::empty(script).declared("f");
110
+ FunctionPlan::compile(script, Routine::function(function).expect("`f` has a body"))
111
+ }
112
+
113
+ #[test]
114
+ fn shadowed_nested_names_do_not_force_outer_locals_into_scopes() {
115
+ let source = "function f(x) { var n = 0, g = function(x) { return x + 1; }; for (; n < 4; n++) x += g(n); return x; }";
116
+ let plan = plan_of(source).expect("`f` has a slot plan");
117
+ assert!(matches!(plan.parameters[..], [Name::Local(..)]));
118
+ assert_eq!(plan.locals, 3, "x, n and g need only numbered slots");
119
+ compare(source, vec![Value::Number(2.0)], vec![], true);
120
+
121
+ let plan = plan_of("function f(x) { return function(y) { return x + y; }; }")
122
+ .expect("`f` has a slot plan");
123
+ assert!(
124
+ matches!(plan.parameters[..], [Name::Scoped(_)]),
125
+ "a true capture still needs a scope"
126
+ );
127
+ }
128
+
105
129
  #[test]
106
130
  fn locals_calls_and_operand_order_match() {
107
131
  for source in [
@@ -169,24 +193,21 @@ fn branches_and_loops_match() {
169
193
  fn functions_declared_in_blocks_are_bound_on_entry() {
170
194
  // A function declared after a block's `return` is callable from the start of the block,
171
195
  // including one that reads the enclosing function's locals.
172
- for (source, slots, result) in [
196
+ for (source, result) in [
173
197
  (
174
198
  "function f(a) { { return g(a) + 1; function g(x) { return x * 3; } } }",
175
- true,
176
199
  "return Const(Number(7.0))",
177
200
  ),
178
201
  (
179
202
  "function f(a) { { var b = 4; return g(1); function g(x) { return a + b + x; } } }",
180
- true,
181
203
  "return Const(Number(7.0))",
182
204
  ),
183
205
  (
184
206
  "function f(a) { try { return g(a); function g(x) { return x + 1; } } finally {} }",
185
- true,
186
207
  "return Const(Number(3.0))",
187
208
  ),
188
209
  ] {
189
- let outcome = compare(source, vec![Value::Number(2.0)], vec![], slots);
210
+ let outcome = compare(source, vec![Value::Number(2.0)], vec![], true);
190
211
  assert!(outcome.starts_with(result), "{source}: {outcome}");
191
212
  }
192
213
  }
@@ -280,26 +301,26 @@ fn numeric_operations_match_javascript_semantics() {
280
301
  f64::NEG_INFINITY,
281
302
  ];
282
303
  let operators = [
283
- BinaryOp::Add,
284
- BinaryOp::Sub,
285
- BinaryOp::Mul,
286
- BinaryOp::Div,
287
- BinaryOp::Mod,
288
- BinaryOp::Exp,
289
- BinaryOp::BitAnd,
290
- BinaryOp::BitOr,
291
- BinaryOp::BitXor,
292
- BinaryOp::LShift,
293
- BinaryOp::RShift,
294
- BinaryOp::ZeroFillRShift,
295
- BinaryOp::EqEq,
296
- BinaryOp::EqEqEq,
297
- BinaryOp::NotEq,
298
- BinaryOp::NotEqEq,
299
- BinaryOp::Lt,
300
- BinaryOp::LtEq,
301
- BinaryOp::Gt,
302
- BinaryOp::GtEq,
304
+ BinaryOperator::Addition,
305
+ BinaryOperator::Subtraction,
306
+ BinaryOperator::Multiplication,
307
+ BinaryOperator::Division,
308
+ BinaryOperator::Remainder,
309
+ BinaryOperator::Exponential,
310
+ BinaryOperator::BitwiseAnd,
311
+ BinaryOperator::BitwiseOR,
312
+ BinaryOperator::BitwiseXOR,
313
+ BinaryOperator::ShiftLeft,
314
+ BinaryOperator::ShiftRight,
315
+ BinaryOperator::ShiftRightZeroFill,
316
+ BinaryOperator::Equality,
317
+ BinaryOperator::StrictEquality,
318
+ BinaryOperator::Inequality,
319
+ BinaryOperator::StrictInequality,
320
+ BinaryOperator::LessThan,
321
+ BinaryOperator::LessEqualThan,
322
+ BinaryOperator::GreaterThan,
323
+ BinaryOperator::GreaterEqualThan,
303
324
  ];
304
325
  for operator in operators {
305
326
  for a in values {