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.
Files changed (395) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +22 -0
  3. data/README.md +8 -3
  4. data/THIRD_PARTY_LICENSES/README.md +71 -254
  5. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  6. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  7. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  8. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  9. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  11. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  12. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  13. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  14. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  15. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  16. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  17. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  18. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  19. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  21. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  22. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  24. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  30. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  32. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  34. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  36. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  38. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  40. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  42. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  43. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  45. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  47. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  49. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  51. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  53. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  55. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  56. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  57. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  58. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  59. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  60. data/UPSTREAM.md +14 -6
  61. data/ext/cfsolve/Cargo.lock +534 -1727
  62. data/ext/cfsolve/Cargo.toml +4 -0
  63. data/ext/cfsolve/src/main.rs +1 -1
  64. data/lib/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  65. data/lib/cfsolve/profiles/chrome-157-macos.json +613 -0
  66. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  67. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  68. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  69. data/lib/cfsolve/version.rb +2 -2
  70. data/lib/cfsolve.rb +1 -1
  71. data/vendor/cfsolve/Cargo.lock +561 -1729
  72. data/vendor/cfsolve/Cargo.toml +26 -8
  73. data/vendor/cfsolve/README.md +57 -5
  74. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  75. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  76. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  77. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  78. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  79. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  80. data/vendor/cfsolve/examples/turnstile_smoke.rs +58 -0
  81. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  82. data/vendor/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  83. data/vendor/cfsolve/profiles/chrome-157-macos.json +613 -0
  84. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  85. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  86. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  87. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  88. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  89. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  90. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  91. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  92. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  93. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  94. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  95. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  96. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  97. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  98. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  99. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  100. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  101. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  102. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  103. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  104. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  105. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  106. data/vendor/cfsolve/src/challenge.rs +1 -0
  107. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  108. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  109. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  110. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  111. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  112. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  113. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  114. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  115. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  116. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  117. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  118. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  119. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  120. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  121. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  122. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  123. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  124. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  125. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  126. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  127. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  128. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  129. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  130. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  131. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  132. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  133. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  134. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  135. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  136. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  137. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  138. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  139. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  140. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  141. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  142. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  143. data/vendor/cfsolve/src/embedding_page/extra_params.rs +132 -24
  144. data/vendor/cfsolve/src/embedding_page/page.rs +41 -1
  145. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  146. data/vendor/cfsolve/src/error.rs +40 -5
  147. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  148. data/vendor/cfsolve/src/http/client.rs +7 -10
  149. data/vendor/cfsolve/src/http/requests.rs +2 -2
  150. data/vendor/cfsolve/src/js/ast.rs +479 -263
  151. data/vendor/cfsolve/src/lib.rs +1 -0
  152. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  153. data/vendor/cfsolve/src/listing/query.rs +1 -47
  154. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  155. data/vendor/cfsolve/src/profiling.rs +49 -0
  156. data/vendor/cfsolve/src/script.rs +35 -24
  157. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  158. data/vendor/cfsolve/src/session/channel.rs +2 -2
  159. data/vendor/cfsolve/src/session/initial.rs +12 -11
  160. data/vendor/cfsolve/src/session/probes.rs +1 -0
  161. data/vendor/cfsolve/src/session/sink.rs +26 -1
  162. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  163. data/vendor/cfsolve/src/session.rs +1 -1
  164. data/vendor/cfsolve/src/solver.rs +3 -1
  165. data/vendor/cfsolve/src/stage2/analysis/analyze.rs +33 -4
  166. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  167. data/vendor/cfsolve/src/stage2/analysis/discovery.rs +13 -2
  168. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  169. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  170. data/vendor/cfsolve/src/stage2/benchmark.rs +113 -41
  171. data/vendor/cfsolve/src/stage2/call_stack.rs +1564 -1041
  172. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  173. data/vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js +1 -0
  174. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  175. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  176. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  177. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  178. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  179. data/vendor/cfsolve/src/stage2/probes/dates.rs +44 -0
  180. data/vendor/cfsolve/src/stage2/probes/parent_info_array.rs +326 -0
  181. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  182. data/vendor/cfsolve/src/stage2/probes/stack.rs +117 -4
  183. data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +80 -2
  184. data/vendor/cfsolve/src/stage2/probes.rs +1 -0
  185. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  186. data/vendor/cfsolve/src/stage2/reference.rs +5 -0
  187. data/vendor/cfsolve/src/stage2/registry.rs +8 -2
  188. data/vendor/cfsolve/src/stage2/replay.rs +34 -3
  189. data/vendor/cfsolve/src/stage2/stylesheets.rs +35 -0
  190. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  191. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  192. data/vendor/cfsolve/src/stage2/value_labels.rs +185 -0
  193. data/vendor/cfsolve/src/stage2/vocabulary.rs +112 -17
  194. data/vendor/cfsolve/src/stage2.rs +3 -0
  195. data/vendor/cfsolve/src/vm/disassemble.rs +75 -7
  196. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  197. data/vendor/cfsolve/src/vm/encoded_names.rs +635 -0
  198. data/vendor/cfsolve/src/vm/extract.rs +550 -250
  199. data/vendor/cfsolve/src/vm/fixtures/free_functions/README.md +9 -0
  200. data/vendor/cfsolve/src/vm/fixtures/free_functions/machine.js +7438 -0
  201. data/vendor/cfsolve/src/vm/fixtures/free_functions/program.base64 +1 -0
  202. data/vendor/cfsolve/src/vm/interpret/access.rs +71 -50
  203. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  204. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  205. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  206. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  207. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  208. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  209. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  210. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  211. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  212. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +160 -58
  213. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  214. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  215. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1765 -0
  216. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  217. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +392 -0
  218. data/vendor/cfsolve/src/vm/interpret/run.rs +120 -45
  219. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  220. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  221. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  222. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  223. data/vendor/cfsolve/src/vm/machine.rs +116 -51
  224. data/vendor/cfsolve/src/vm/output.rs +19 -6
  225. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  226. data/vendor/cfsolve/src/vm/registers.rs +35 -21
  227. data/vendor/cfsolve/src/vm/session.rs +189 -121
  228. data/vendor/cfsolve/src/vm/value.rs +22 -19
  229. data/vendor/cfsolve/src/vm.rs +3 -1
  230. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  231. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  232. metadata +106 -178
  233. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  234. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  235. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  237. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  238. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  239. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  240. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  241. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  242. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  243. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  244. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  245. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  246. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  247. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  248. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  249. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  250. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  251. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  252. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  253. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  255. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  256. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  257. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  258. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  259. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  260. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  261. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  262. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  263. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  264. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  265. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  266. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  268. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  269. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  270. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  271. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  272. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  273. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  274. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  277. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  278. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  279. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  280. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  281. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  282. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  283. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  284. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  286. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  288. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  289. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  290. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  291. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  292. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  293. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  294. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  295. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  296. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  297. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  298. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  299. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  300. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  301. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  302. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  303. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  305. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  329. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  330. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  331. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  332. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  333. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  334. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  335. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  336. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  337. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  338. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  339. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  340. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  341. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  342. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  343. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  344. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  345. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  346. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  347. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  348. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  349. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  350. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  351. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  352. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  353. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  354. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  355. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  356. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  357. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  358. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  359. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  360. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  361. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  362. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  363. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  364. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  365. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  366. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  367. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  368. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  369. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  370. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  371. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  372. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  373. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  374. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  375. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  376. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  377. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  378. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  379. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  380. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  381. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  382. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  383. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  384. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  385. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  386. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  387. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  388. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  389. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  390. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  391. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  392. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  393. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  394. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  395. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -22,292 +22,309 @@
22
22
  //! use the selector, `arguments`, or declarations from another case. Each new function gets
23
23
  //! separate bindings for the remaining parameters. Cases with no callers are removed.
24
24
 
25
- use swc_core::common::{DUMMY_SP, Mark, SyntaxContext};
26
- use swc_core::ecma::ast::{
27
- BlockStmt, CallExpr, Callee, ClassDecl, Decl, Expr, FnDecl, Function, Id, Ident, Lit, Program,
28
- Stmt, SwitchStmt, VarDeclarator,
25
+ use oxc::allocator::{Box, CloneIn, GetAllocator, TakeIn, Vec as ArenaVec};
26
+ use oxc::ast::ast::{
27
+ Argument, BindingIdentifier, BindingPattern, CallExpression, Expression, Function,
28
+ FunctionType, IdentifierReference, Program, Statement,
29
29
  };
30
- use swc_core::ecma::visit::{Visit, VisitMut, VisitMutWith, VisitWith};
30
+ use oxc::ast_visit::{Visit, VisitMut, walk, walk_mut};
31
+ use oxc::span::GetSpan;
32
+ use oxc::syntax::node::NodeId;
33
+ use oxc::syntax::reference::ReferenceFlags;
34
+ use oxc::syntax::scope::ScopeFlags;
35
+ use oxc::syntax::symbol::SymbolId;
31
36
 
32
- use super::analysis::{Analysis, Bindings, names};
33
- use super::state_machines::escapes;
34
- use super::{HashMap, HashSet};
35
- use crate::js::ast;
37
+ use super::analysis::{Analysis, Id};
38
+ use super::ast::LabeledContinue;
39
+ use super::{HashMap, HashSet, ast};
36
40
 
37
- pub(super) fn run(program: &mut Program, analysis: &mut Analysis) -> bool {
38
- let bindings = analysis.bindings(program);
39
- let mut merged = Merged {
40
- bindings,
41
- functions: HashMap::default(),
42
- };
43
- program.visit_with(&mut merged);
41
+ pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
42
+ let candidates = ast::functions(program, analysis, &|function| {
43
+ function.r#type == FunctionType::FunctionDeclaration
44
+ && function.body.as_ref().is_some_and(|body| {
45
+ matches!(body.statements.as_slice(), [Statement::SwitchStatement(_)])
46
+ })
47
+ });
48
+ let mut functions = HashMap::default();
49
+ for (id, function) in candidates {
50
+ if let Some(selection) = selection(function, analysis) {
51
+ functions.insert(id, selection);
52
+ }
53
+ }
44
54
  let mut calls = Calls {
45
- functions: &merged.functions,
55
+ analysis,
56
+ functions: &functions,
46
57
  picked: HashMap::default(),
47
58
  };
48
- program.visit_with(&mut calls);
49
- // Replacement function for each case selected by a call.
50
- let mut splits: HashMap<Id, Vec<Option<Ident>>> = HashMap::default();
59
+ calls.visit_program(program);
60
+ let mut splits = HashMap::default();
51
61
  for (id, picked) in calls.picked {
52
- let Some(picked) = picked.filter(|picked| picked.calls == bindings.references(&id)) else {
62
+ if picked.calls != analysis.bindings.references(&id) {
53
63
  continue;
54
- };
55
- let context = SyntaxContext::empty().apply_mark(Mark::new());
56
- let names: Vec<Option<Ident>> = (0..merged.functions[&id].labels.len())
57
- .map(|index| {
58
- picked
59
- .cases
60
- .contains(&index)
61
- .then(|| Ident::new(format!("{}_{index}", id.0).into(), DUMMY_SP, context))
62
- })
63
- .collect();
64
- splits.insert(id, names);
64
+ }
65
+ let scope = analysis.scope(id);
66
+ let base = analysis.name(id).to_owned();
67
+ let span = analysis.span(id);
68
+ let names = (0..functions[&id].labels.len()).map(|index| {
69
+ let used = picked.cases.contains(&index);
70
+ used.then(|| analysis.fresh_binding(&format!("{base}_{index}"), scope, span))
71
+ });
72
+ splits.insert(id, names.collect());
65
73
  }
66
74
  if splits.is_empty() {
67
75
  return false;
68
76
  }
69
- program.visit_mut_with(&mut Unmerge {
70
- functions: &merged.functions,
77
+ Unmerge {
78
+ analysis,
79
+ functions: &functions,
71
80
  splits: &splits,
72
- });
81
+ }
82
+ .visit_program(program);
73
83
  true
74
84
  }
75
85
 
76
- /// Maps selector values to cases in a merged function.
77
- struct Selection {
86
+ /// Maps numeric selector values to cases in a merged function.
87
+ struct Selection<'a> {
78
88
  selector: Id,
79
- discriminant: Expr,
89
+ discriminant: &'a Expression<'a>,
80
90
  labels: Vec<f64>,
81
91
  }
82
92
 
83
- impl Selection {
84
- /// Returns the case selected by `selector`.
85
- fn case(&self, selector: f64) -> Option<usize> {
86
- let value = ast::fold_number(&self.discriminant, &|leaf| {
87
- (leaf.as_ident()?.to_id() == self.selector).then_some(selector)
93
+ impl Selection<'_> {
94
+ /// Evaluates the discriminant with the call's literal first argument as the selector, and
95
+ /// finds the matching case label.
96
+ fn called_case(&self, call: &CallExpression<'_>, analysis: &Analysis<'_>) -> Option<usize> {
97
+ let value = ast::number(call.arguments.first()?.as_expression()?)?;
98
+ let selected = ast::fold_number(self.discriminant, &|expression| {
99
+ (analysis.expression_id(expression) == Some(self.selector)).then_some(value)
88
100
  })?;
89
- self.labels.iter().position(|&label| label == value)
101
+ self.labels.iter().position(|&label| label == selected)
90
102
  }
91
103
  }
92
104
 
93
- /// Finds merged function declarations.
94
- struct Merged<'bindings> {
95
- bindings: &'bindings Bindings,
96
- functions: HashMap<Id, Selection>,
97
- }
98
-
99
- impl Merged<'_> {
100
- fn selection(&self, function: &Function) -> Option<Selection> {
101
- let selector = names::parameter_ids(&function.params)?.first()?.clone();
102
- let [Stmt::Switch(switch)] = &function.body.as_ref()?.stmts[..] else {
103
- return None;
104
- };
105
- // The discriminant is computed from the selector alone.
106
- ast::fold_number(&switch.discriminant, &|leaf| {
107
- (leaf.as_ident()?.to_id() == selector).then_some(0.0)
108
- })?;
109
- let labels = switch
110
- .cases
111
- .iter()
112
- .map(|case| ast::fold_number(case.test.as_deref()?, &|_| None))
113
- .collect::<Option<Vec<_>>>()?;
114
- let separate = !function.is_async
115
- && !function.is_generator
116
- && names::mentions(&*switch.discriminant, std::slice::from_ref(&selector))
117
- && self.bindings.references(&selector) == 1
118
- && !names::uses_arguments(&switch.cases)
119
- && switch.cases.iter().all(|case| {
120
- matches!(case.cons.last(), Some(Stmt::Return(_) | Stmt::Throw(_)))
121
- && !escapes(&case.cons)
122
- })
123
- && independent(switch);
124
- separate.then(|| Selection {
125
- selector,
126
- discriminant: (*switch.discriminant).clone(),
127
- labels,
128
- })
105
+ /// Recognizes a switch controlled only by the first parameter. Cases must return or throw,
106
+ /// never use the selector or `arguments`, and never refer to declarations from another case.
107
+ fn selection<'a>(function: &'a Function<'a>, analysis: &Analysis<'a>) -> Option<Selection<'a>> {
108
+ let selector = *ast::parameters(function)?.first()?;
109
+ let [Statement::SwitchStatement(switch)] = function.body.as_ref()?.statements.as_slice() else {
110
+ return None;
111
+ };
112
+ let depends_on_selector = |expression: &Expression<'_>| {
113
+ (analysis.expression_id(expression) == Some(selector)).then_some(0.0)
114
+ };
115
+ if function.r#async
116
+ || function.generator
117
+ || analysis.bindings.references(&selector) != 1
118
+ || ast::fold_number(&switch.discriminant, &depends_on_selector).is_none()
119
+ {
120
+ return None;
129
121
  }
130
- }
131
-
132
- impl Visit for Merged<'_> {
133
- fn visit_fn_decl(&mut self, declaration: &FnDecl) {
134
- if self.bindings.is_written_once(&declaration.ident.to_id())
135
- && let Some(selection) = self.selection(&declaration.function)
122
+ let labels: Vec<f64> = switch
123
+ .cases
124
+ .iter()
125
+ .map(|case| ast::fold_number(case.test.as_ref()?, &|_| None))
126
+ .collect::<Option<_>>()?;
127
+ let mut declarations = vec![];
128
+ for case in &switch.cases {
129
+ if !matches!(
130
+ case.consequent.last(),
131
+ Some(Statement::ReturnStatement(_) | Statement::ThrowStatement(_))
132
+ ) || ast::escapes(&case.consequent, LabeledContinue::Any)
136
133
  {
137
- self.functions.insert(declaration.ident.to_id(), selection);
134
+ return None;
135
+ }
136
+ let mut declared = Declared::default();
137
+ for statement in &case.consequent {
138
+ declared.visit_statement(statement)
138
139
  }
139
- declaration.visit_children_with(self);
140
+ if declared.arguments {
141
+ return None;
142
+ }
143
+ declarations.push(declared.ids);
140
144
  }
141
- }
142
-
143
- /// Checks that no case refers to a binding declared in another case.
144
- fn independent(switch: &SwitchStmt) -> bool {
145
- let declared: Vec<Vec<Id>> = switch
146
- .cases
147
- .iter()
148
- .map(|case| {
149
- let mut declarations = Declarations::default();
150
- case.cons.visit_with(&mut declarations);
151
- declarations.0
152
- })
153
- .collect();
154
- switch.cases.iter().enumerate().all(|(index, case)| {
155
- declared
156
- .iter()
157
- .enumerate()
158
- .all(|(other, ids)| other == index || !names::mentions(&case.cons, ids))
145
+ for (index, case) in switch.cases.iter().enumerate() {
146
+ for (other, ids) in declarations.iter().enumerate() {
147
+ if index != other && ast::mentions(&case.consequent, ids, analysis) {
148
+ return None;
149
+ }
150
+ }
151
+ }
152
+ Some(Selection {
153
+ selector,
154
+ discriminant: &switch.discriminant,
155
+ labels,
159
156
  })
160
157
  }
161
158
 
159
+ /// Collects a case's bindings, outside nested functions, and whether it mentions `arguments`.
162
160
  #[derive(Default)]
163
- struct Declarations(Vec<Id>);
161
+ struct Declared {
162
+ ids: Vec<Id>,
163
+ arguments: bool,
164
+ }
164
165
 
165
- impl Visit for Declarations {
166
- fn visit_var_declarator(&mut self, declarator: &VarDeclarator) {
167
- self.0
168
- .extend(swc_ecma_utils::find_pat_ids::<_, Id>(&declarator.name));
169
- declarator.visit_children_with(self);
166
+ impl<'a> Visit<'a> for Declared {
167
+ fn visit_binding_identifier(&mut self, binding: &BindingIdentifier<'a>) {
168
+ if let Some(symbol) = binding.symbol_id.get() {
169
+ self.ids.push(Id::Local(symbol))
170
+ }
170
171
  }
171
172
 
172
- fn visit_fn_decl(&mut self, declaration: &FnDecl) {
173
- self.0.push(declaration.ident.to_id());
174
- declaration.visit_children_with(self);
173
+ fn visit_identifier_reference(&mut self, reference: &IdentifierReference<'a>) {
174
+ self.arguments |= ast::is_arguments(reference);
175
175
  }
176
176
 
177
- fn visit_class_decl(&mut self, declaration: &ClassDecl) {
178
- self.0.push(declaration.ident.to_id());
179
- declaration.visit_children_with(self);
180
- }
177
+ fn visit_function(&mut self, _: &Function<'a>, _: ScopeFlags) {}
181
178
  }
182
179
 
183
- /// Finds the cases selected by calls to a merged function. Returns `None` if any reference is not a
184
- /// direct call with a literal selector that matches a case.
185
180
  #[derive(Default)]
186
181
  struct Picked {
187
182
  calls: usize,
188
183
  cases: HashSet<usize>,
189
184
  }
190
185
 
191
- struct Calls<'functions> {
192
- functions: &'functions HashMap<Id, Selection>,
193
- picked: HashMap<Id, Option<Picked>>,
186
+ /// Counts the calls of each merged function with a constant selector and the cases they pick.
187
+ struct Calls<'b, 'a> {
188
+ analysis: &'b Analysis<'a>,
189
+ functions: &'b HashMap<Id, Selection<'a>>,
190
+ picked: HashMap<Id, Picked>,
194
191
  }
195
192
 
196
- /// Extracts the function name and literal selector from `function(selector, ...)`.
197
- fn selected_call(call: &CallExpr) -> Option<(Id, Option<f64>)> {
198
- let callee = call.callee.as_expr()?.as_ident()?.to_id();
199
- let spreads = call.args.iter().any(|argument| argument.spread.is_some());
200
- let selector = match call.args.first().map(|first| &*first.expr) {
201
- Some(Expr::Lit(Lit::Num(number))) if !spreads => Some(number.value),
202
- _ => None,
203
- };
204
- Some((callee, selector))
205
- }
206
-
207
- impl Visit for Calls<'_> {
208
- fn visit_call_expr(&mut self, call: &CallExpr) {
209
- if let Some((id, selector)) = selected_call(call)
193
+ impl<'a> Visit<'a> for Calls<'_, 'a> {
194
+ fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
195
+ if let Some(id) = self.analysis.expression_id(&call.callee)
210
196
  && let Some(selection) = self.functions.get(&id)
197
+ && let Some(case) = selection.called_case(call, self.analysis)
198
+ && !call.optional
199
+ && !call.arguments.iter().any(Argument::is_spread)
211
200
  {
212
- let case = selector.and_then(|value| selection.case(value));
213
- let picked = self
214
- .picked
215
- .entry(id)
216
- .or_insert_with(|| Some(Picked::default()));
217
- match (picked.as_mut(), case) {
218
- (Some(picked), Some(case)) => {
219
- picked.calls += 1;
220
- picked.cases.insert(case);
221
- }
222
- _ => *picked = None,
223
- }
201
+ let picked = self.picked.entry(id).or_default();
202
+ picked.calls += 1;
203
+ picked.cases.insert(case);
224
204
  }
225
- call.visit_children_with(self);
205
+ walk::walk_call_expression(self, call)
226
206
  }
227
207
  }
228
208
 
229
- /// Creates replacement functions for the cases of `declaration` listed in `names`.
230
- fn split(declaration: FnDecl, names: &[Option<Ident>]) -> Vec<Stmt> {
231
- let mut function = declaration.function;
232
- let mut body = function.body.take().expect("checked when collected");
233
- let Some(Stmt::Switch(switch)) = body.stmts.pop() else {
234
- unreachable!("checked when collected");
235
- };
236
- let _selector = function.params.remove(0);
237
- let mut functions = vec![];
238
- for (case, name) in switch.cases.into_iter().zip(names) {
239
- let Some(name) = name else { continue };
240
- // Give each split function separate parameter bindings.
241
- let context = SyntaxContext::empty().apply_mark(Mark::new());
242
- let renamed: HashMap<Id, Ident> = function
243
- .params
244
- .iter()
245
- .filter_map(|parameter| parameter.pat.as_ident())
246
- .map(|parameter| {
247
- let fresh = Ident::new(parameter.sym.clone(), parameter.span, context);
248
- (parameter.to_id(), fresh)
249
- })
250
- .collect();
251
- let mut rename = Rename(&renamed);
252
- let mut separate = function.clone();
253
- separate.params.visit_mut_with(&mut rename);
254
- let mut stmts = case.cons;
255
- stmts.visit_mut_with(&mut rename);
256
- separate.body = Some(BlockStmt {
257
- stmts,
258
- ..body.clone()
259
- });
260
- functions.push(Stmt::Decl(Decl::Fn(FnDecl {
261
- ident: name.clone(),
262
- declare: false,
263
- function: separate,
264
- })));
265
- }
266
- functions
209
+ struct Unmerge<'b, 'a> {
210
+ analysis: &'b mut Analysis<'a>,
211
+ functions: &'b HashMap<Id, Selection<'a>>,
212
+ splits: &'b HashMap<Id, Vec<Option<BindingIdentifier<'a>>>>,
267
213
  }
268
214
 
269
- struct Unmerge<'a> {
270
- functions: &'a HashMap<Id, Selection>,
271
- splits: &'a HashMap<Id, Vec<Option<Ident>>>,
215
+ impl<'a> Unmerge<'_, 'a> {
216
+ /// Creates a separate declaration for each selected case, omitting cases with no callers.
217
+ /// Each new function gets its own scope and parameter symbols; references are rebound to those
218
+ /// symbols so later rewrites and hygiene cannot conflate parameters from different cases.
219
+ fn split(
220
+ &mut self,
221
+ mut function: Function<'a>,
222
+ names: &[Option<BindingIdentifier<'a>>],
223
+ ) -> ArenaVec<'a, Statement<'a>> {
224
+ let allocator = self.analysis.allocator();
225
+ let mut split = ArenaVec::new_in(&allocator);
226
+ let Some(body) = &mut function.body else {
227
+ return split;
228
+ };
229
+ // The switch moves out, so each copy of the function clones only its own case.
230
+ let statements = body.statements.take_in(&allocator);
231
+ let Some(Statement::SwitchStatement(switch)) = statements.first() else {
232
+ return split;
233
+ };
234
+ let merged_scope = function
235
+ .scope_id
236
+ .get()
237
+ .expect("semantic analysis assigns function scopes");
238
+ let parent = self.analysis.scoping.scope_parent_id(merged_scope);
239
+ for (case, name) in switch.cases.iter().zip(names) {
240
+ let Some(name) = name else { continue };
241
+ let mut separate = function.clone_in_with_semantic_ids(allocator);
242
+ separate.id = Some(name.clone_in_with_semantic_ids(allocator));
243
+ separate.params.items.remove(0);
244
+ let scope =
245
+ self.analysis
246
+ .scoping
247
+ .add_scope(parent, NodeId::DUMMY, ScopeFlags::Function);
248
+ separate.scope_id.set(Some(scope));
249
+ let mut renamed = HashMap::default();
250
+ for parameter in &mut separate.params.items {
251
+ if let Some(binding) = parameter.pattern.get_binding_identifier() {
252
+ let fresh = self.analysis.binding(&binding.name, scope, binding.span);
253
+ renamed.insert(Id::Local(binding.symbol_id()), fresh.symbol_id());
254
+ let fresh = Box::new_in(fresh, &allocator);
255
+ parameter.pattern = BindingPattern::BindingIdentifier(fresh);
256
+ }
257
+ }
258
+ let mut statements = case.consequent.clone_in_with_semantic_ids(allocator);
259
+ let mut rename = Rename {
260
+ analysis: self.analysis,
261
+ renamed: &renamed,
262
+ };
263
+ rename.visit_statements(&mut statements);
264
+ if let Some(body) = &mut separate.body {
265
+ body.statements = statements;
266
+ }
267
+ split.push(Statement::FunctionDeclaration(Box::new_in(
268
+ separate, &allocator,
269
+ )));
270
+ }
271
+ split
272
+ }
272
273
  }
273
274
 
274
- impl VisitMut for Unmerge<'_> {
275
- fn visit_mut_stmts(&mut self, statements: &mut Vec<Stmt>) {
276
- statements.visit_mut_children_with(self);
277
- let mut replaced = Vec::with_capacity(statements.len());
278
- for statement in statements.drain(..) {
279
- match statement {
280
- Stmt::Decl(Decl::Fn(declaration))
281
- if self.splits.contains_key(&declaration.ident.to_id()) =>
282
- {
283
- let names = &self.splits[&declaration.ident.to_id()];
284
- replaced.extend(split(declaration, names));
285
- }
286
- statement => replaced.push(statement),
275
+ impl<'a> VisitMut<'a> for Unmerge<'_, 'a> {
276
+ fn visit_statements(&mut self, statements: &mut ArenaVec<'a, Statement<'a>>) {
277
+ walk_mut::walk_statements(self, statements);
278
+ let splits = self.splits;
279
+ let mut out = ArenaVec::new_in(&self.analysis.ast);
280
+ for statement in statements.take_in(&self.analysis.ast) {
281
+ let Statement::FunctionDeclaration(function) = statement else {
282
+ out.push(statement);
283
+ continue;
284
+ };
285
+ match ast::function_id(&function).and_then(|id| splits.get(&id)) {
286
+ Some(names) => out.extend(self.split(function.unbox(), names)),
287
+ None => out.push(Statement::FunctionDeclaration(function)),
287
288
  }
288
289
  }
289
- *statements = replaced;
290
+ *statements = out;
290
291
  }
291
292
 
292
- fn visit_mut_call_expr(&mut self, call: &mut CallExpr) {
293
- call.visit_mut_children_with(self);
294
- if let Some((id, Some(selector))) = selected_call(call)
293
+ fn visit_call_expression(&mut self, call: &mut CallExpression<'a>) {
294
+ walk_mut::walk_call_expression(self, call);
295
+ if let Some(id) = self.analysis.expression_id(&call.callee)
295
296
  && let Some(names) = self.splits.get(&id)
296
- && let Some(case) = self.functions[&id].case(selector)
297
- && let Some(Some(name)) = names.get(case)
297
+ && let Some(case) = self.functions[&id].called_case(call, self.analysis)
298
+ && let Some(name) = &names[case]
298
299
  {
299
- call.callee = Callee::Expr(Box::new(Expr::Ident(name.clone())));
300
- call.args.remove(0);
300
+ let span = call.callee.span();
301
+ let reference = self
302
+ .analysis
303
+ .reference(name.symbol_id(), span, ReferenceFlags::Read);
304
+ call.callee = Expression::Identifier(Box::new_in(reference, &self.analysis.ast));
305
+ call.arguments.remove(0);
301
306
  }
302
307
  }
303
308
  }
304
309
 
305
- struct Rename<'a>(&'a HashMap<Id, Ident>);
310
+ /// Rebinds references to the parameters of a split function.
311
+ struct Rename<'b, 'a> {
312
+ analysis: &'b mut Analysis<'a>,
313
+ renamed: &'b HashMap<Id, SymbolId>,
314
+ }
306
315
 
307
- impl VisitMut for Rename<'_> {
308
- fn visit_mut_ident(&mut self, identifier: &mut Ident) {
309
- if let Some(fresh) = self.0.get(&identifier.to_id()) {
310
- *identifier = fresh.clone();
316
+ impl<'a> VisitMut<'a> for Rename<'_, 'a> {
317
+ fn visit_identifier_reference(&mut self, reference: &mut IdentifierReference<'a>) {
318
+ if let Some(id) = self.analysis.id(reference)
319
+ && let Some(&renamed) = self.renamed.get(&id)
320
+ {
321
+ // Resolving `id` required a reference ID.
322
+ let flags = self
323
+ .analysis
324
+ .scoping
325
+ .get_reference(reference.reference_id())
326
+ .flags();
327
+ *reference = self.analysis.reference(renamed, reference.span, flags);
311
328
  }
312
329
  }
313
330
  }
@@ -316,9 +333,35 @@ impl VisitMut for Rename<'_> {
316
333
  mod tests {
317
334
  use crate::deobfuscate::testing;
318
335
 
336
+ #[test]
337
+ fn splits_cases_with_labeled_jumps_inside_the_handler() {
338
+ let output = testing::rewrite(
339
+ r#"function m(s,a) {
340
+ switch(s^5) {
341
+ case 1: handler: { if(a) break handler; work(a); } return;
342
+ case 2: loop: while(a) { a--; if(a) continue loop; break loop; } return;
343
+ }
344
+ } m(4,x); m(7,y);"#,
345
+ super::run,
346
+ );
347
+ testing::assert_contains(
348
+ &output,
349
+ &[
350
+ "function m_0(a)",
351
+ "function m_1(a)",
352
+ "break handler;",
353
+ "continue loop;",
354
+ "break loop;",
355
+ "m_0(x);",
356
+ "m_1(y);",
357
+ ],
358
+ );
359
+ testing::assert_lacks(&output, &["switch"]);
360
+ }
361
+
319
362
  #[test]
320
363
  fn splits_cases_that_literal_selectors_pick() {
321
- let transform = |source: &str| testing::rewrite(source, super::run, /* fix= */ true);
364
+ let transform = |source: &str| testing::rewrite(source, super::run);
322
365
  let merged = "function m(s, a) {
323
366
  switch (s ^ 5) {
324
367
  case 1: var x = a + 1; return x;
@@ -329,7 +372,6 @@ mod tests {
329
372
  let output = transform(&format!("{merged} h(m(4, p), m(7, q), m(4, r));"));
330
373
  testing::assert_contains(
331
374
  &output,
332
- &[],
333
375
  &[
334
376
  "function m_0(a) { var x = a + 1; return x; }",
335
377
  "function m_1(a) { g(a); return; }",