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
@@ -14,6 +14,7 @@ use std::ops::Range;
14
14
  use rustc_hash::FxHashMap;
15
15
 
16
16
  use super::reference::REFERENCE;
17
+ pub(crate) use crate::challenge::is_hex_name;
17
18
  use crate::js::{JsObject, JsValue};
18
19
 
19
20
  /// Session names and the reference names they stand for.
@@ -84,6 +85,8 @@ impl Vocabulary {
84
85
 
85
86
  fn between<S: AsRef<[String]>>(session: &[S], reference: &[Vec<String>]) -> Self {
86
87
  let (partners, candidates) = pair_probes(session, reference);
88
+ let cleaned_session = without_wrapper_names(session.iter().map(AsRef::as_ref));
89
+ let cleaned_reference = without_wrapper_names(reference.iter().map(Vec::as_slice));
87
90
  let mut all = Votes::new();
88
91
  let mut probes = Vec::with_capacity(session.len());
89
92
  for (index, strings) in session.iter().enumerate() {
@@ -94,7 +97,25 @@ impl Vocabulary {
94
97
  *all.entry(pair).or_default() += 1;
95
98
  }
96
99
  }
97
- probes.push(Names::one_to_one(&votes));
100
+ let mut names = Names::one_to_one(&votes);
101
+ if let Some(partner) = partners[index] {
102
+ let mut supplemental = Votes::new();
103
+ for pair in aligned_names(&cleaned_session[index], &cleaned_reference[partner - 1])
104
+ {
105
+ *supplemental.entry(pair).or_default() += 1;
106
+ }
107
+ let consistent = Names::one_to_one(&supplemental);
108
+ for (&(session, reference), &count) in &supplemental {
109
+ if consistent.to_reference.get(session).map(String::as_str) == Some(reference)
110
+ && !names.to_reference.contains_key(session)
111
+ && !names.to_session.contains_key(reference)
112
+ {
113
+ names.pair(session.to_owned(), reference.to_owned());
114
+ *all.entry((session, reference)).or_default() += count;
115
+ }
116
+ }
117
+ }
118
+ probes.push(names);
98
119
  }
99
120
  Self {
100
121
  global: Names::one_to_one(&all),
@@ -107,17 +128,17 @@ impl Vocabulary {
107
128
  /// Replaces name pairs for probe `index` with mappings recovered from its code. Removes any
108
129
  /// existing pair involving either name. Used when code analysis identifies a field more
109
130
  /// reliably than string alignment.
110
- pub(crate) fn pin<'a>(
131
+ pub(crate) fn pin<S: Into<String>>(
111
132
  &mut self,
112
133
  index: usize,
113
- pairs: impl IntoIterator<Item = (String, &'a str)>,
134
+ pairs: impl IntoIterator<Item = (String, S)>,
114
135
  ) {
115
136
  let Some(names) = self.probes.get_mut(index) else {
116
137
  return;
117
138
  };
118
139
  for (session, reference) in pairs {
119
140
  // Identical names are kept too, so the program-wide map cannot rename them.
120
- names.pair(session, reference.to_owned());
141
+ names.pair(session, reference.into());
121
142
  }
122
143
  }
123
144
 
@@ -176,6 +197,31 @@ impl Vocabulary {
176
197
  }
177
198
  }
178
199
 
200
+ /// Wrapper names and encrypted diagnostics move independently of probe fields. A second,
201
+ /// conservative alignment omits them and only fills pairs the original alignment left open.
202
+ fn without_wrapper_names<'a>(probes: impl Iterator<Item = &'a [String]>) -> Vec<Vec<String>> {
203
+ let probes: Vec<_> = probes.collect();
204
+ let mut counts = HashMap::new();
205
+ for probe in &probes {
206
+ for text in probe.iter().collect::<HashSet<_>>() {
207
+ *counts.entry(text.as_str()).or_insert(0) += 1;
208
+ }
209
+ }
210
+ probes
211
+ .iter()
212
+ .map(|probe| {
213
+ probe
214
+ .iter()
215
+ .filter(|text| {
216
+ !is_log_message(text)
217
+ && !(is_name(text) && 4 * counts[text.as_str()] > 3 * probes.len())
218
+ })
219
+ .cloned()
220
+ .collect()
221
+ })
222
+ .collect()
223
+ }
224
+
179
225
  /// Renames strings and object keys using `rename`, including randomized names inside longer
180
226
  /// strings, such as a list of names or a style rule's selector.
181
227
  fn rewrite<'a>(value: &mut JsValue, rename: &impl Fn(&str) -> Option<&'a String>) {
@@ -183,6 +229,16 @@ fn rewrite<'a>(value: &mut JsValue, rename: &impl Fn(&str) -> Option<&'a String>
183
229
  JsValue::String(text) => {
184
230
  if let Some(name) = rename(text) {
185
231
  *text = name.clone();
232
+ } else if matches!(text.trim_start().as_bytes().first(), Some(b'[' | b'{'))
233
+ && let Ok(mut value) = serde_json::from_str::<JsValue>(text)
234
+ {
235
+ // Some probes serialize structured results before adding them to the record.
236
+ // Canonical labels inside those results need the same translation as arrays.
237
+ let original = value.clone();
238
+ rewrite(&mut value, rename);
239
+ if value != original {
240
+ *text = serde_json::to_string(&value).expect("JSON values serialize");
241
+ }
186
242
  } else if let Some(renamed) = rename_embedded(text, rename) {
187
243
  *text = renamed;
188
244
  }
@@ -357,11 +413,11 @@ fn aligned_names<'a>(session: &'a [String], reference: &'a [String]) -> Vec<(&'a
357
413
  let (mut left_names, left_texts): (Vec<_>, Vec<_>) = session[i..run.session]
358
414
  .iter()
359
415
  .copied()
360
- .partition(|text| is_name(text));
416
+ .partition(|text| is_name(text) && !shared.contains(text));
361
417
  let (mut right_names, right_texts): (Vec<_>, Vec<_>) = reference[j..run.reference]
362
418
  .iter()
363
419
  .copied()
364
- .partition(|text| is_name(text));
420
+ .partition(|text| is_name(text) && !shared.contains(text));
365
421
  // Repeats of a name in a row count once, even across non-name text.
366
422
  left_names.dedup();
367
423
  right_names.dedup();
@@ -510,17 +566,6 @@ fn is_name(text: &str) -> bool {
510
566
  .any(|c| c.is_ascii_uppercase() || c.is_ascii_digit()))
511
567
  }
512
568
 
513
- /// Whether `text` is a randomized name in the form newer builds use: `_` and 24 lowercase hex
514
- /// digits, such as `_2b78d2cde0fa83bfaec4edae`.
515
- pub(crate) fn is_hex_name(text: &str) -> bool {
516
- text.strip_prefix('_').is_some_and(|hex| {
517
- hex.len() == 24
518
- && hex
519
- .bytes()
520
- .all(|byte| matches!(byte, b'0'..=b'9' | b'a'..=b'f'))
521
- })
522
- }
523
-
524
569
  #[cfg(test)]
525
570
  mod tests {
526
571
  use super::*;
@@ -606,6 +651,11 @@ mod tests {
606
651
  "Math sqrt log1p acosh Qrst1 toString",
607
652
  vec![("Abcd1", "Qrst1")],
608
653
  ),
654
+ (
655
+ "a:b Abcd1 toString c:d toString",
656
+ "a:b Qrst1 c:d toString",
657
+ vec![("Abcd1", "Qrst1")],
658
+ ),
609
659
  ];
610
660
  for (session, reference, expected) in cases {
611
661
  assert_eq!(
@@ -615,6 +665,23 @@ mod tests {
615
665
  }
616
666
  }
617
667
 
668
+ #[test]
669
+ fn shared_wrapper_names_do_not_hide_unmapped_outputs() {
670
+ let session = [
671
+ strings("a:b Wrap1 Abcd1 c:d"),
672
+ strings("e:f Wrap1 c:d"),
673
+ strings("g:h Wrap1 c:d"),
674
+ ];
675
+ let reference = [
676
+ strings("a:b Qrst1 c:d"),
677
+ strings("e:f c:d"),
678
+ strings("g:h c:d"),
679
+ ];
680
+ let vocabulary = Vocabulary::between(&session, &reference);
681
+ assert_eq!(vocabulary.to_session(0, "Qrst1"), "Abcd1");
682
+ assert_eq!(vocabulary.to_reference(0, "Wrap1"), "Wrap1");
683
+ }
684
+
618
685
  /// A probe that shares only three of seven stable strings with its reference still pairs,
619
686
  /// as the devtools probe must when a program never names `document`.
620
687
  #[test]
@@ -647,6 +714,34 @@ mod tests {
647
714
  assert_eq!(vocabulary.global.to_session.len(), 1);
648
715
  }
649
716
 
717
+ #[test]
718
+ fn translates_serialized_results_without_converting_their_schema() {
719
+ let mut vocabulary = Vocabulary::infer(&[strings("geolocation")]);
720
+ vocabulary.pin(0, [("_111111111111111111111111".into(), "geolocation")]);
721
+ let mut fields = JsObject::from_iter([
722
+ ("pairs".into(), json!(r#"[["geolocation","denied"]]"#)),
723
+ (
724
+ "objects".into(),
725
+ json!(r#"[{"name":"geolocation","state":"denied"}]"#),
726
+ ),
727
+ ("unrelated".into(), json!(" [ 1, 2 ]")),
728
+ ("invalid".into(), json!("[not JSON")),
729
+ ]);
730
+ vocabulary.rewrite_to_session(0, &mut fields);
731
+ assert_eq!(
732
+ fields["pairs"],
733
+ json!(r#"[["_111111111111111111111111","denied"]]"#)
734
+ );
735
+ assert_eq!(
736
+ fields["objects"],
737
+ json!(r#"[{"name":"_111111111111111111111111","state":"denied"}]"#)
738
+ );
739
+ assert_eq!(fields["unrelated"], json!(" [ 1, 2 ]"));
740
+ assert_eq!(fields["invalid"], json!("[not JSON"));
741
+ vocabulary.rewrite_to_reference(0, &mut fields);
742
+ assert_eq!(fields["pairs"], json!(r#"[["geolocation","denied"]]"#));
743
+ }
744
+
650
745
  #[test]
651
746
  fn pinned_names_replace_aligned_pairs_in_their_probe() {
652
747
  let session = [strings("a:b Abcd1 c:d"), strings("e:f Wxyz2 g:h")];
@@ -17,11 +17,14 @@ pub mod interaction;
17
17
  pub mod payload;
18
18
  pub(crate) mod probes;
19
19
  pub(crate) mod proof;
20
+ pub(crate) mod queries;
20
21
  pub mod records;
21
22
  pub(crate) mod reference;
22
23
  pub mod registry;
23
24
  pub mod replay;
24
25
  mod stylesheets;
26
+ mod syntax;
25
27
  pub mod trace;
28
+ mod value_labels;
26
29
  pub mod vocabulary;
27
30
  mod worker_timing;
@@ -14,15 +14,15 @@ use std::ops::ControlFlow;
14
14
 
15
15
  use anyhow::{Result, bail};
16
16
  use indexmap::IndexSet;
17
+ use oxc::syntax::operator::BinaryOperator;
17
18
  use rustc_hash::FxBuildHasher;
18
- use swc_core::ecma::ast::BinaryOp;
19
19
 
20
20
  use super::interpret::Way;
21
21
  use super::machine::{Loaded, Machine};
22
22
  use super::output::{Constant, Effect, Exit, Hidden, Instruction, Listing, Path, Position, Term};
23
23
  use super::value::Value;
24
- use super::{HashMap, convert, dataflow, packed_names};
25
- use crate::candidates;
24
+ use super::{HashMap, convert, dataflow, encoded_names, packed_names};
25
+ use crate::{candidates, profiling};
26
26
 
27
27
  impl Machine<'_> {
28
28
  /// Follows entry paths, created functions, and installed exception handlers.
@@ -70,6 +70,11 @@ impl Machine<'_> {
70
70
  listing.failures.sort_unstable_by_key(|failure| failure.pc);
71
71
  fuse_method_calls(&mut listing);
72
72
  packed_names::fold(&mut listing);
73
+ encoded_names::fold(&mut listing);
74
+ // Decoding captured keys makes method loads stable even after their key register is
75
+ // reused before the call.
76
+ fuse_method_calls(&mut listing);
77
+ profiling::report("VM");
73
78
  Ok(listing)
74
79
  }
75
80
  }
@@ -353,7 +358,10 @@ fn compared(condition: &Term, field: &str) -> Option<f64> {
353
358
  let mut number = None;
354
359
  condition.visit(&mut |term| {
355
360
  if let Term::Binary(
356
- BinaryOp::EqEqEq | BinaryOp::NotEqEq | BinaryOp::EqEq | BinaryOp::NotEq,
361
+ BinaryOperator::StrictEquality
362
+ | BinaryOperator::StrictInequality
363
+ | BinaryOperator::Equality
364
+ | BinaryOperator::Inequality,
357
365
  left,
358
366
  right,
359
367
  ) = term
@@ -449,7 +457,7 @@ fn incoming_loads(
449
457
  /// Tracks registers holding `object[key]` while the object and key registers remain unchanged.
450
458
  /// Saves facts at each instruction's entry. Uses a vector because these sets are small.
451
459
  #[derive(Clone, Default)]
452
- struct Loads(Vec<(u8, Load)>);
460
+ struct Loads(Vec<(u8, Load)>, BTreeMap<u8, Term>);
453
461
 
454
462
  impl Loads {
455
463
  fn get(&self, register: u8) -> Option<&Load> {
@@ -462,9 +470,12 @@ impl Loads {
462
470
  impl dataflow::Facts for Loads {
463
471
  fn meet(&mut self, other: &Self) -> bool {
464
472
  let before = self.0.len();
473
+ let constants = self.1.len();
465
474
  self.0
466
475
  .retain(|(register, load)| other.get(*register) == Some(load));
467
- self.0.len() < before
476
+ self.1
477
+ .retain(|register, value| other.1.get(register) == Some(value));
478
+ self.0.len() < before || self.1.len() < constants
468
479
  }
469
480
  }
470
481
 
@@ -479,6 +490,11 @@ fn update_loads(loads: &mut Loads, effect: &Effect) {
479
490
  let Effect::Set(register, value) = effect else {
480
491
  return;
481
492
  };
493
+ let constant = match value {
494
+ Term::Const(Constant::String(text)) if text.len() <= 128 => Some(value.clone()),
495
+ Term::Reg(source) => loads.1.get(source).cloned(),
496
+ _ => None,
497
+ };
482
498
  loads.0.retain(|(loaded, load)| {
483
499
  loaded != register && load.object != *register && load.key != Term::Reg(*register)
484
500
  });
@@ -491,9 +507,22 @@ fn update_loads(loads: &mut Loads, effect: &Effect) {
491
507
  _ => false,
492
508
  }
493
509
  {
494
- let key = (**key).clone();
510
+ let key = if let Term::Reg(register) = **key {
511
+ loads
512
+ .1
513
+ .get(&register)
514
+ .cloned()
515
+ .unwrap_or_else(|| (**key).clone())
516
+ } else {
517
+ (**key).clone()
518
+ };
495
519
  loads.0.push((*register, Load { object, key }));
496
520
  }
521
+ if let Some(value) = constant {
522
+ loads.1.insert(*register, value);
523
+ } else {
524
+ loads.1.remove(register);
525
+ }
497
526
  }
498
527
 
499
528
  /// Rewrites a call of a register still holding `object[key]` with `object` as receiver. Calls
@@ -511,3 +540,42 @@ fn fuse_call(term: &mut Term, loads: &Loads) {
511
540
  *this = None;
512
541
  }
513
542
  }
543
+
544
+ #[cfg(test)]
545
+ mod tests {
546
+ use super::*;
547
+
548
+ #[test]
549
+ fn method_keys_survive_register_reuse_but_receivers_do_not() {
550
+ let mut loads = Loads::default();
551
+ let key = Term::Const(Constant::String("mark".into()));
552
+ update_loads(&mut loads, &Effect::Set(1, key.clone()));
553
+ update_loads(
554
+ &mut loads,
555
+ &Effect::Set(2, Term::Get(Box::new(Term::Reg(3)), Box::new(Term::Reg(1)))),
556
+ );
557
+ update_loads(
558
+ &mut loads,
559
+ &Effect::Set(1, Term::Const(Constant::String("prefix".into()))),
560
+ );
561
+ let call = Term::Call {
562
+ callee: Box::new(Term::Reg(2)),
563
+ this: Some(Box::new(Term::Reg(3))),
564
+ arguments: vec![],
565
+ };
566
+ let mut fused = call.clone();
567
+ fuse_call(&mut fused, &loads);
568
+ assert_eq!(
569
+ fused,
570
+ Term::Call {
571
+ callee: Box::new(Term::Get(Box::new(Term::Reg(3)), Box::new(key))),
572
+ this: None,
573
+ arguments: vec![]
574
+ }
575
+ );
576
+ update_loads(&mut loads, &Effect::Set(3, Term::Const(Constant::Null)));
577
+ let mut after_replacement = call.clone();
578
+ fuse_call(&mut after_replacement, &loads);
579
+ assert_eq!(after_replacement, call);
580
+ }
581
+ }
@@ -7,23 +7,48 @@
7
7
  //! the fast path and execute only the fallback statements. These advance the program counter,
8
8
  //! produce the switch value as the opcode, and store the next dispatch key in its register.
9
9
 
10
- use anyhow::{Context, Result};
11
- use swc_core::common::DUMMY_SP;
12
- use swc_core::ecma::ast::{
13
- BinaryOp, BlockStmt, Decl, Expr, Function, Ident, Lit, ReturnStmt, Stmt,
14
- };
10
+ use std::{ptr, slice};
11
+
12
+ use anyhow::{Context, Result, bail};
13
+ use oxc::ast::ast::{Expression, Function, Statement, VariableDeclaration};
14
+ use oxc::syntax::operator::BinaryOperator;
15
15
 
16
16
  use super::extract::{Argument, DispatchLoop};
17
- use super::interpret;
17
+ use super::interpret::{self, Routine};
18
18
  use super::session::Session;
19
19
  use super::value::Value;
20
+ use crate::js::ast::Script;
20
21
 
21
- /// Function extracted from the dispatch loop to decode opcodes.
22
- pub(crate) struct Dispatch {
23
- /// `function(<loop parameters>) { var <loop locals>; <decoding>; return <opcode>; }`.
24
- decoder: Function,
22
+ /// The opcode decoder extracted from the dispatch loop.
23
+ pub(crate) struct Dispatch<'a> {
24
+ pub(super) decoder: Decoder<'a>,
25
25
  /// Values passed to each loop parameter.
26
- arguments: Vec<Argument>,
26
+ pub(super) arguments: Vec<Argument>,
27
+ }
28
+
29
+ /// The dispatch loop's decoding statements, run as
30
+ /// `function(<loop parameters>) { var <loop locals>; <decoding>; return <opcode>; }`.
31
+ pub(crate) struct Decoder<'a> {
32
+ /// The dispatch loop, whose parameters the decoder takes.
33
+ pub(crate) function: &'a Function<'a>,
34
+ /// The loop's local declarations, run without their initializers.
35
+ pub(crate) declarations: Vec<&'a VariableDeclaration<'a>>,
36
+ pub(crate) decoding: &'a [Statement<'a>],
37
+ /// The switch discriminant, a local holding the opcode.
38
+ pub(crate) opcode: &'a Expression<'a>,
39
+ }
40
+
41
+ impl Decoder<'_> {
42
+ /// The decoder as a routine the interpreter runs.
43
+ pub(crate) fn routine(&self) -> Routine<'_> {
44
+ Routine {
45
+ parameters: &self.function.params,
46
+ declarations: &self.declarations,
47
+ statements: self.decoding,
48
+ returns: Some(self.opcode),
49
+ address: ptr::from_ref(self).addr(),
50
+ }
51
+ }
27
52
  }
28
53
 
29
54
  /// Decoded opcode and dispatch key for one program byte.
@@ -34,70 +59,67 @@ pub(crate) struct Decoded {
34
59
  pub(crate) key: u8,
35
60
  }
36
61
 
37
- impl Dispatch {
38
- pub(crate) fn from_loop(dispatch: &DispatchLoop<'_>) -> Result<Self> {
62
+ impl<'a> Dispatch<'a> {
63
+ pub(crate) fn from_loop(script: Script<'a>, dispatch: &DispatchLoop<'a>) -> Result<Self> {
39
64
  let function = dispatch.function;
40
65
  let body = function
41
66
  .body
42
- .as_ref()
67
+ .as_deref()
43
68
  .context("the dispatch loop function has no body")?;
44
69
  let looping = body
45
- .stmts
70
+ .statements
46
71
  .iter()
47
- .find_map(Stmt::as_while_stmt)
72
+ .find_map(|statement| match statement {
73
+ Statement::WhileStatement(looping) => Some(looping),
74
+ _ => None,
75
+ })
48
76
  .context("the dispatch loop function has no loop")?;
49
- let statements = match &*looping.body {
50
- Stmt::Block(block) => &block.stmts[..],
51
- statement => std::slice::from_ref(statement),
52
- };
77
+ let statements = block_statements(&looping.body);
53
78
  let (at, switch) = statements
54
79
  .iter()
55
80
  .enumerate()
56
- .find_map(|(at, statement)| Some((at, statement.as_switch()?)))
81
+ .find_map(|(at, statement)| match statement {
82
+ Statement::SwitchStatement(switch) => Some((at, switch)),
83
+ _ => None,
84
+ })
57
85
  .context("the dispatch loop has no switch")?;
58
- let opcode = switch
59
- .discriminant
60
- .as_ident()
61
- .context("the dispatch switch is not on a local")?
62
- .clone();
86
+ let opcode = &switch.discriminant;
87
+ let Expression::Identifier(opcode_name) = opcode else {
88
+ bail!("the dispatch switch is not on a local");
89
+ };
63
90
  let prefix = &statements[..at];
64
91
  // Match `<opcode> = <fast path>; if (<opcode> < 0) { <decoding> }`.
92
+ let is_opcode = |expression: &Expression<'a>| {
93
+ matches!(expression, Expression::Identifier(name)
94
+ if script.binding(name) == script.binding(opcode_name))
95
+ };
65
96
  let decoding = match prefix.last() {
66
- Some(Stmt::If(branch))
67
- if branch.alt.is_none() && is_negative(&branch.test, &opcode) =>
97
+ Some(Statement::IfStatement(branch))
98
+ if branch.alternate.is_none() && is_negative(&branch.test, is_opcode) =>
68
99
  {
69
- match &*branch.cons {
70
- Stmt::Block(block) => block.stmts.clone(),
71
- statement => vec![statement.clone()],
72
- }
73
- }
74
- _ => prefix.to_vec(),
75
- };
76
- // Preserve the loop local declarations without initializers.
77
- let declarations = body.stmts.iter().chain(prefix).filter_map(|statement| {
78
- let Stmt::Decl(Decl::Var(declaration)) = statement else {
79
- return None;
80
- };
81
- let mut declaration = declaration.clone();
82
- for declarator in &mut declaration.decls {
83
- declarator.init = None;
100
+ block_statements(&branch.consequent)
84
101
  }
85
- Some(Stmt::Decl(Decl::Var(declaration)))
86
- });
87
- let returned = Stmt::Return(ReturnStmt {
88
- span: DUMMY_SP,
89
- arg: Some(Box::new(Expr::Ident(opcode))),
90
- });
91
- let decoder = Function {
92
- body: Some(BlockStmt {
93
- span: body.span,
94
- ctxt: body.ctxt,
95
- stmts: declarations.chain(decoding).chain([returned]).collect(),
96
- }),
97
- ..function.clone()
102
+ _ => prefix,
98
103
  };
104
+ // Keep the loop local declarations, without their initializers.
105
+ let declarations = body
106
+ .statements
107
+ .iter()
108
+ .chain(prefix)
109
+ .filter_map(|statement| match statement {
110
+ Statement::VariableDeclaration(declaration) if !declaration.kind.is_using() => {
111
+ Some(&**declaration)
112
+ }
113
+ _ => None,
114
+ })
115
+ .collect();
99
116
  Ok(Self {
100
- decoder,
117
+ decoder: Decoder {
118
+ function,
119
+ declarations,
120
+ decoding,
121
+ opcode,
122
+ },
101
123
  arguments: dispatch.arguments.clone(),
102
124
  })
103
125
  }
@@ -120,20 +142,26 @@ impl Dispatch {
120
142
  Argument::Other => Value::Undefined,
121
143
  })
122
144
  .collect();
123
- interpret::decode(session, program, &self.decoder, arguments, pc, key)
145
+ interpret::decode(session, program, self.decoder.routine(), arguments, pc, key)
146
+ }
147
+ }
148
+
149
+ /// The statements of a block, or `statement` alone.
150
+ fn block_statements<'b, 'a>(statement: &'b Statement<'a>) -> &'b [Statement<'a>] {
151
+ match statement {
152
+ Statement::BlockStatement(block) => &block.body,
153
+ statement => slice::from_ref(statement),
124
154
  }
125
155
  }
126
156
 
127
157
  /// Matches `<opcode> < 0` or `0 > <opcode>`.
128
- fn is_negative(test: &Expr, opcode: &Ident) -> bool {
129
- let Some(test) = test.unwrap_parens().as_bin() else {
158
+ fn is_negative<'a>(test: &Expression<'a>, is_opcode: impl Fn(&Expression<'a>) -> bool) -> bool {
159
+ let Expression::BinaryExpression(test) = test.without_parentheses() else {
130
160
  return false;
131
161
  };
132
- let is_opcode = |expr: &Expr| expr.as_ident().is_some_and(|name| name.sym == opcode.sym);
133
- let is_zero = |expr: &Expr| matches!(expr, Expr::Lit(Lit::Num(number)) if number.value == 0.0);
134
- match test.op {
135
- BinaryOp::Lt => is_opcode(&test.left) && is_zero(&test.right),
136
- BinaryOp::Gt => is_zero(&test.left) && is_opcode(&test.right),
162
+ match test.operator {
163
+ BinaryOperator::LessThan => is_opcode(&test.left) && test.right.is_number_0(),
164
+ BinaryOperator::GreaterThan => test.left.is_number_0() && is_opcode(&test.right),
137
165
  _ => false,
138
166
  }
139
167
  }