mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-10-04 02:31:36 +00:00
Some checks are pending
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
CodeQL / Analyze (python) (push) Waiting to run
Gitleaks / gitleaks (push) Waiting to run
Publish / Classify release event (push) Waiting to run
Publish / RC guard (marker + release-PR skip) (push) Blocked by required conditions
Publish / ci (push) Blocked by required conditions
Publish / Publish to npm (push) Blocked by required conditions
Publish / Build & Push RC Docker images (push) Blocked by required conditions
Scorecard / Scorecard analysis (push) Waiting to run
Trivy Image Scan / Trivy (gitnexus-cli) (push) Waiting to run
Trivy Image Scan / Trivy (gitnexus-web) (push) Waiting to run
* feat(cfg): model Java value-position switch as control flow (#2207) A value-position `switch` expression with ≥2 arms is now modeled as a CFG dispatch in the two highest-value carriers, instead of collapsing the owning statement to a single inline block: - `var x = switch (k) { … }` — the arms become real blocks reached by `switch-case` edges and rejoin at a binding continuation that carries the declared name's def (uses stay on the arm blocks). - `return switch (k) { … }` — each arm returns the function result, threading every active finalizer. This makes the arms control-dependent on the dispatch (the point of #2207 — they previously produced zero CDG), mirroring the Kotlin / Rust value-position binding pattern. `breaksBlock` routes a value-switch declaration out of `visitSeq` coalescing; `visitReturn` and `visitStmt` gain the carrier handling; `java-harvest` gains `bindingDefFacts`. An assignment RHS (`x = switch …`), a call argument, and a multi- declarator decl remain inline (documented gap). Java has no value- position `if` (the ternary is excluded, like Kotlin's elvis). Verified: 51 java-visitor tests (4 new), full CFG unit+integration suites (661) green, CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(cfg): model C# value-position switch expression as control flow (#2207) A C# `switch_expression` (`k switch { p => v, … }`) with ≥2 arms is now modeled as a CFG `switch-case` dispatch — a discriminant block, each arm value a block reached by a dispatch edge, all arms rejoining at one exit — in the three value-position carriers, instead of collapsing the owning construct to a single inline block: - `var x = k switch { … }` — arms rejoin at a binding continuation that carries the declared name's def (discriminant + arm uses on the arms). - `return k switch { … }` — each arm returns the function result, threading every active finalizer. - `=> k switch { … }` expression-bodied member — each arm returns. The arms are now control-dependent on the discriminant (the point of #2207 — they previously produced zero CDG). Arm patterns / `when` guards are harvested as conditional uses on the dispatch; an unguarded `_`/`var` arm is the exhaustive catch-all (a non-exhaustive switch keeps EXIT reachable via a no-match edge). `switch_expression` is distinct from `switch_statement`, so this adds a dedicated `visitSwitchExpr`. An assignment RHS (`x = k switch …`), a call argument, and a multi- declarator decl remain inline (documented gap). `csharp-harvest` gains `bindingDefFacts`. Verified: 47 csharp-visitor tests (4 new), full CFG unit+integration suites (664) green, CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(cfg): model PHP value-position match expression as control flow (#2207) A PHP `match($v) { c => v, default => v }` with ≥2 arms is now modeled as a CFG `switch-case` dispatch — a discriminant block, each arm value a block reached by a dispatch edge, all arms rejoining at one exit (no fallthrough) — in the two value-position carriers, instead of collapsing the owning statement to one inline block: - `$x = match($v) { … }` — the dominant PHP idiom (no typed local decl): arms rejoin at a binding continuation carrying the assignment target's def (condition + arm uses on the arms). - `return match($v) { … }` — each arm returns the function result, threading every active finally. The arms are now control-dependent on the discriminant (the point of #2207). Arm `match_condition_list`s are harvested as conditional uses on the dispatch; a `default` arm is the catch-all (a defaultless `match` throws UnhandledMatchError, kept EXIT-reachable via a no-match edge). `php-harvest` gains `assignmentDefFacts`. A `match` in a call argument / nested subexpression stays inline; the ternary `?:` is excluded by design (a micro-branch, like elvis). Verified: 37 php-visitor tests (3 new), CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(cfg): model Dart value-position switch expression as control flow (#2207) A Dart 3 value-position `switch (v) { p => e, _ => e }` with ≥2 arms is now modeled as a CFG `switch-case` dispatch — a discriminant block, each arm value a block reached by a dispatch edge, all arms rejoining at one exit (no fallthrough) — in the two value-position carriers, instead of collapsing the owning statement to one inline block: - `var x = switch (v) { … }` — single-binding decl; arms rejoin at a binding continuation carrying the declared name's def. - `return switch (v) { … }` — each arm returns the function result, threading every active finalizer. The arms are now control-dependent on the discriminant (the point of #2207). A Dart call value parses as `identifier` + `selector` (multiple children, not one node), so the arm-value facts come from a dedicated `switchExprArmValueFacts`; arm patterns harvest conditionally onto the dispatch; a `_` arm is the catch-all (a non-exhaustive switch keeps EXIT reachable via a no-match edge). `dart-harvest` gains `bindingDefFacts` + the arm value/pattern fact helpers. A `switch_expression` in a call argument / multi-binding decl stays inline (its conditional arm sub-evaluation remains the #2206 harvest may-def path, re-pointed in the regression test). `?:`/`??`/`?.` excluded by design. Verified: 39 dart-visitor tests (4 new), CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(cfg): model Swift value-position if/switch as control flow (#2207) A Swift 5.9 value-position `if`/`switch` is now modeled as control flow in the two value-position carriers, instead of collapsing the owning statement to one inline block: - `let x = if … else … / switch v { … }` — arms rejoin at a binding continuation carrying the declared name's def (condition + arm uses on the branch blocks). - `return if … / switch …` — each arm returns the function result, threading every active finalizer. The arms are now control-dependent on the branch (the point of #2207). tree-sitter-swift reuses `if_statement` / `switch_statement` for the value form (no separate `if_expression`/`switch_expression`), so the existing `visitIf`/`visitSwitch` are reused — this mirrors the Kotlin carrier exactly. `swift-harvest` gains `bindingDefFacts`. A value-position `if` requires an `else`; a value `switch` needs ≥2 entries. A value branch in a call argument / interpolation stays inline; `?:`/`??` are excluded by design. Verified: 31 swift-visitor tests (4 new), CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(cfg): model Kotlin assignment-RHS and value-position try as control flow (#2205) Completes the value-position branch carriers #2205 left deferred after the initial val/var-binding + return + expr-body work: - `x = when (k) { … }` / `x = if (c) a else b` / `x = try { … }` — a plain `=` assignment whose RHS is a modelable branch now models the arms as control flow and binds the LHS target at the rejoin (a compound `+=` and a plain-call RHS stay inline). - `val x = try { … } catch { … }` — a value-position `try` is now a modelable value branch (reusing visitTry), so the binding/assignment carriers route it through control flow too. The arms are now control-dependent on the branch (the point of #2205). `isModelableValueBranch` gains `try_expression`; `visitBranchExpr` routes it to `visitTry`; `isControlFlow`/`visitStmt` gain the `assignment` carrier; `kotlin-harvest` gains `assignmentDefFacts`. A branch nested in a call argument (`f(when …)`) stays inline (the direct value is the call); `?:`/`?.` micro-branches excluded by design. The `return try { … }` carrier is intentionally left out (finalizer-threading in return position is risky and was not requested). Verified: 43 kotlin-visitor tests (5 new), full CFG unit+integration suites (676) green, CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(cfg): Java colon-form value switch — yield ends the arm, no fallthrough (#2211) Tri-review (adversarial + correctness lanes) found that a value-position colon-form switch expression — `int x = switch(k){ case 1: yield a(); case 2: yield b(); }` (valid Java 14+) — reused the statement `visitSwitch` fallthrough logic, wiring a spurious `fallthrough` edge between the yield-terminated colon groups. A switch EXPRESSION never falls through between arms; the false edge dropped an arm's control-dependence edge and added a false reaching-defs propagation edge (verified by a real-parser probe). Arrow-form value switches were already correct. Root cause: `visitYield` modeled `yield e;` as a block that CONTINUES to the next statement. Semantically `yield` produces the switch-expression's value and EXITS the switch. Fix: `visitYield` now terminates the arm, jumping to the enclosing switch's exit and threading any finalizer it crosses — exactly like a `break` out of the switch, but carrying the yielded value's facts. Adds `ControlFlowContext.resolveYield()` (nearest SWITCH frame, never an intervening loop). `yield` is Java-only here (C# `yield return` is iterator semantics, untouched). Tests: a colon-form value switch asserting NO `fallthrough` edge and that BOTH arms are control-dependent on the dispatch (specific controller→ dependent pairs), plus a `return switch(…)` inside `try/finally` asserting `finally-return` threading per arm. Verified: full CFG unit+integration suites green, CDG snapshot byte- identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(cfg): Dart value switch — guarded `_` is not a catch-all; guard is a dispatch test (#2211) Tri-review (adversarial + correctness lanes) found two issues in the Dart `visitSwitchExpr` value-position modeling: 1. Catch-all detection was `pattern.text === '_'`, ignoring guards. A guarded `_ when c => …` is NOT exhaustive (Dart throws at runtime if no arm + guard matches), so falsely treating it as a catch-all suppressed the conservative no-match edge — asserting an exhaustive switch that isn't. The sibling C# visitor already gated catch-all on `!guard`. 2. A `when` guard parses as a bare sibling between the pattern and the value (no wrapper node), so it fell into the arm-VALUE children and was harvested as an unconditional arm-value use instead of a conditional dispatch test. Fix: new `armParts()` splits a `switch_expression_case` at the `=>` token into pattern / guard(s) / value(s). The pattern AND guard are harvested conditionally onto the dispatch block (they evaluate before the body, only when earlier arms missed); the arm-value facts come from the post-`=>` children only; the catch-all is gated on an unguarded `_`. Removes the now- unused dart-harvest `switchExprArm{Value,Pattern}Facts` (the visitor harvests per-child via the existing `facts`/`factsConditional`). Tests: a guarded value switch asserting the no-match edge is present (3 switch-case successors from the dispatch) and EXIT stays reachable, plus a test that the guard's use is recorded on the dispatch block, not an arm. Verified: full CFG suites green, CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(cfg): Kotlin return try {…} models the value-position try (#2205, #2211) Tri-review (maintainability + testing lanes) caught a doc-vs-code mismatch: the visitor header documents a `return <branch>` carrier that includes `try`, but `visitReturn` only matched `when_expression`/`if_expression`, so `return try { … } catch { … }` fell through to the single inline-block path — its arms were not modeled. Fix: `visitReturn` now also matches `try_expression`, making the `return` carrier uniform with the binding / assignment / expression-body carriers (all route a value-position `try` through `isModelableValueBranch` → `visitTry`, threading the active finalizers per arm). No new machinery — just completes the carrier set the docstring already claimed. Tests: `return try {…} catch {…}` (throw + return edges, CDG-bearing, EXIT reachable) and `x = try {…} catch {…}` assignment-RHS (the assignment carrier's try path, previously untested). Verified: full CFG suites green, CDG snapshot byte-identical, bench --check PASS. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(cfg): cover the no-match edge of non-exhaustive C#/PHP value switches (#2211) The testing lane noted the `hasCatchAll`/`hasDefault === false` branch — where a value-position `switch`/`match` with no catch-all/default arm adds a conservative no-match edge so EXIT stays reachable — was untested (every existing fixture used a `_`/`default` arm). Adds a C# `x switch { 1 => …, 2 => … }` and a PHP `match($x){ 1 => …, 2 => … }` (no default) test, each asserting the dispatch fans to (arms + 1) `switch-case` successors and `isExitReachableFromAllBlocks` holds. Verified: full CFG suites green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(cfg): clarify Kotlin value-position try gate covers the finally-only path (#2211) Tri-review (maintainability lane) noted the inline comment at the `try_expression` branch of `isModelableValueBranch` said only "a catch's value", but the gate fires on `catch_block || finally_block`. Reword to acknowledge that a value-position `try` with a `catch` OR a `finally` is a modelable branch. Comment-only; no behavior change. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(cfg): document the deliberate C# declaratorInit duplication (#2211) Tri-review (maintainability lane) flagged the byte-identical `declaratorInit` helper in `csharp.ts` (visitor) and `csharp-harvest.ts` (harvester). The two are standalone classes with no shared base (repo convention) and the only module both import is the generic `utils/ast-helpers` (types only) — not a home for a C#-grammar-specific helper. Resolve the lowest-risk way: a cross-reference comment at each definition noting the deliberate duplication and the keep-in-sync requirement. No new shared module; no behavior change. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor(cfg): unwrap the paren in Dart visitSwitch for dispatch consistency (#2211) Tri-review (maintainability lane) noted `visitSwitch` (statement form) used the raw parenthesized `condition` (dispatch text `switch (x)`) while the new `visitSwitchExpr` unwraps it (`switch x`). Probed the vendored tree-sitter-dart: the `switch_statement` condition IS a `parenthesized_expression`, so apply `unwrapParen` in `visitSwitch` too. The harvest walks into the paren either way, so the discriminant's def/use facts are unchanged — only the dispatch block's text string normalizes. Verified byte-identical (cdg-snapshot + bench --check unchanged; the Dart unit tests assert topology, not block text). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(cfg): Swift single-entry value switch stays inline (#2211) Tri-review (testing lane) noted the existing Swift "stays inline" test used a plain call (`let x = g()`), which never exercises the single-entry switch gate. Add a real one-entry value switch (`let x = switch v { default: g() }`) asserting it coalesces (no switch-case edge), pinning the `>= 2` switch_entry threshold in `isModelableValueBranch`. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(cfg): cover the Kotlin expression-body try carrier (#2205, #2211) Tri-review (testing lane) noted the `fun f() = try { … } catch { … }` expression-body carrier (visitExprBody -> isModelableValueBranch accepting try_expression) existed but was untested. Add a regression asserting the expr-body try is modeled (throw + return edges, CDG-bearing, EXIT reachable). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(cfg): pin the value-branch carriers never throw on a truncated AST (R4) (#2211) Tri-review (adversarial lane) noted the new value-position branch carriers must return undefined / never throw on a malformed AST, or a single bad function would drop the whole file's CFG group (the R4 invariant). Add a per-language regression feeding a TRUNCATED value-branch carrier (an unterminated `var x = switch/match/if/when (…)`) through the existing `collectFunctions` + `buildFunctionCfg(...).not.toThrow()` graceful-undefined harness, for all six languages whose value-branch path is new (Java/C#/PHP/Dart/Swift/Kotlin). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
417 lines
19 KiB
TypeScript
417 lines
19 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import { requireVendoredGrammar } from '../../../src/core/tree-sitter/vendored-grammars.js';
|
|
import { createSwiftCfgVisitor } from '../../../src/core/ingestion/cfg/visitors/swift.js';
|
|
import type { FunctionCfg } from '../../../src/core/ingestion/cfg/types.js';
|
|
import {
|
|
makeCfgHarness,
|
|
type CfgHarness,
|
|
block,
|
|
edgeKinds,
|
|
reaches,
|
|
reachable,
|
|
bindingIdx,
|
|
} from '../../helpers/cfg-harness.js';
|
|
import { isExitReachableFromAllBlocks } from '../../../src/core/ingestion/cfg/post-dominators.js';
|
|
import { computeControlDependence } from '../../../src/core/ingestion/cfg/control-dependence.js';
|
|
|
|
// The Swift CfgVisitor, one hazard per test (real-parser regression, NOT
|
|
// snapshot-pinning). Swift's grammar is VENDORED (not an npm package): the
|
|
// grammar loads from vendor/ via `requireVendoredGrammar('tree-sitter-swift')`,
|
|
// exactly like the C/C++ test loads the vendored tree-sitter-c. Each fixture's
|
|
// distinctive statement text (step(), done(), handle(e), …) lets us locate the
|
|
// block for a region by text and assert the control-flow topology around it.
|
|
|
|
const swiftGrammar = requireVendoredGrammar('tree-sitter-swift') as Parameters<
|
|
typeof makeCfgHarness
|
|
>[0];
|
|
|
|
const swift: CfgHarness = makeCfgHarness(swiftGrammar, createSwiftCfgVisitor(), 'fixture.swift');
|
|
|
|
describe('Swift CfgVisitor — structure', () => {
|
|
it('straight-line body: ENTRY → block → EXIT (seq)', () => {
|
|
const cfg = swift.cfgOf(`func f() { a(); b(); c() }`);
|
|
expect(cfg.blocks.filter((b) => b.kind === 'normal')).toHaveLength(1);
|
|
const body = block(cfg, 'a()');
|
|
expect(cfg.edges).toContainEqual({ from: cfg.entryIndex, to: body, kind: 'seq' });
|
|
expect(reaches(cfg, body, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('empty body: ENTRY → EXIT', () => {
|
|
const cfg = swift.cfgOf(`func f() {}`);
|
|
expect(cfg.blocks).toHaveLength(2);
|
|
expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('an unmodeled shape produces a graceful partial CFG (never throws)', () => {
|
|
// A protocol method requirement (`func f()`) has no body — buildFunctionCfg
|
|
// must return undefined rather than throw; a real function still builds.
|
|
const root = swift.parse(`protocol P { func f() }`);
|
|
const fns = swift.collectFunctions(root);
|
|
for (const fn of fns) {
|
|
expect(() => createSwiftCfgVisitor().buildFunctionCfg(fn, 'p.swift')).not.toThrow();
|
|
}
|
|
// A normal function still builds a well-formed CFG.
|
|
const cfg = swift.cfgOf(`func g() { x() }`);
|
|
expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('a truncated value-position if never throws out of the carrier path (R4) (#2211)', () => {
|
|
const root = swift.parse(`func f(v: Int) { let x = if v > 0 {`);
|
|
for (const fn of swift.collectFunctions(root)) {
|
|
expect(() => createSwiftCfgVisitor().buildFunctionCfg(fn, 'f.swift')).not.toThrow();
|
|
}
|
|
});
|
|
|
|
it('init and deinit are CFG-bearing functions', () => {
|
|
const cfgs = swift.cfgsOf(`class C { init(x: Int) { self.x = x } ; deinit { cleanup() } }`);
|
|
expect(cfgs).toHaveLength(2);
|
|
for (const cfg of cfgs) expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — branching', () => {
|
|
it('if/else: cond-true to then, cond-false to else, both reach the join', () => {
|
|
const cfg = swift.cfgOf(`func f(x: Int) { if x > 0 { a() } else { b() } ; c() }`);
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
const join = block(cfg, 'c()');
|
|
expect(reaches(cfg, block(cfg, 'a()'), join)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'b()'), join)).toBe(true);
|
|
});
|
|
|
|
it('else-if chain branches each condition', () => {
|
|
const cfg = swift.cfgOf(
|
|
`func f(x: Int) { if x == 1 { a() } else if x == 2 { b() } else { c() } ; d() }`,
|
|
);
|
|
const join = block(cfg, 'd()');
|
|
expect(reaches(cfg, block(cfg, 'a()'), join)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'b()'), join)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'c()'), join)).toBe(true);
|
|
});
|
|
|
|
it('if let binds the optional and reaches both arms', () => {
|
|
const cfg = swift.cfgOf(`func f(opt: Int?) { if let y = opt { use(y) } ; after() }`);
|
|
// `y` is a binding defined by the optional binding.
|
|
const y = bindingIdx(cfg, 'y');
|
|
const defined = cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(y)));
|
|
expect(defined).toBe(true);
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(true);
|
|
expect(reachable(cfg, block(cfg, 'use(y)'))).toBe(true);
|
|
expect(reachable(cfg, block(cfg, 'after()'))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — guard', () => {
|
|
it('guard let ... else { return }: the else DIVERGES, the body CONTINUES', () => {
|
|
const cfg = swift.cfgOf(
|
|
`func f(opt: Int?) -> Int { guard let y = opt else { return 0 } ; use(y) ; return y }`,
|
|
);
|
|
const header = block(cfg, 'guard');
|
|
const elseBlk = block(cfg, 'return 0');
|
|
// The else is the cond-false (diverging) arm and returns.
|
|
expect(cfg.edges).toContainEqual({ from: header, to: elseBlk, kind: 'cond-false' });
|
|
expect(reaches(cfg, elseBlk, cfg.exitIndex)).toBe(true);
|
|
// The guarded body continues straight-line on the success path.
|
|
expect(reaches(cfg, header, block(cfg, 'use(y)'))).toBe(true);
|
|
// `y` is bound by the guard and used after it.
|
|
const y = bindingIdx(cfg, 'y');
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(y)))).toBe(true);
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.uses.includes(y)))).toBe(true);
|
|
});
|
|
|
|
it('guard case .some(let v) binds v as a real local def, not a synthetic global (#2206)', () => {
|
|
const cfg = swift.cfgOf(
|
|
`func f(e: E) { guard case .some(let v) = e else { return } ; use(v) }`,
|
|
);
|
|
const v = bindingIdx(cfg, 'v');
|
|
// The case-pattern binder must be a real local with a def (or may-def) from
|
|
// the matched subject — previously it resolved to a synthetic global with only
|
|
// a use, which silently breaks taint propagation from the subject.
|
|
const defined = cfg.blocks.some((bl) =>
|
|
bl.statements?.some((s) => s.defs.includes(v) || (s.mayDefs ?? []).includes(v)),
|
|
);
|
|
expect(defined).toBe(true);
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.uses.includes(v)))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — loops', () => {
|
|
it('for-in: header + body + loop-back + exit', () => {
|
|
const cfg = swift.cfgOf(`func f() { for item in items { step() } ; done() }`);
|
|
const header = block(cfg, 'for item in items');
|
|
const body = block(cfg, 'step()');
|
|
expect(cfg.edges).toContainEqual({ from: body, to: header, kind: 'loop-back' });
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(true);
|
|
expect(reaches(cfg, header, block(cfg, 'done()'))).toBe(true);
|
|
// The loop pattern binds `item`.
|
|
const item = bindingIdx(cfg, 'item');
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(item)))).toBe(true);
|
|
});
|
|
|
|
it('while: header tests first, body loops back', () => {
|
|
const cfg = swift.cfgOf(`func f() { while cond() { step() } ; done() }`);
|
|
const header = block(cfg, 'while cond()');
|
|
const body = block(cfg, 'step()');
|
|
expect(cfg.edges).toContainEqual({ from: body, to: header, kind: 'loop-back' });
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(true);
|
|
expect(reaches(cfg, header, block(cfg, 'done()'))).toBe(true);
|
|
});
|
|
|
|
it('repeat-while runs the body BEFORE testing, then loops back from the bottom', () => {
|
|
const cfg = swift.cfgOf(`func f() { repeat { step() } while cond() ; done() }`);
|
|
const body = block(cfg, 'step()');
|
|
const cond = block(cfg, 'while cond()');
|
|
expect(reaches(cfg, cfg.entryIndex, body)).toBe(true); // body runs first
|
|
expect(reaches(cfg, body, cond)).toBe(true); // condition tests at the bottom
|
|
expect(cfg.edges).toContainEqual({ from: cond, to: body, kind: 'loop-back' });
|
|
expect(reaches(cfg, cond, block(cfg, 'done()'))).toBe(true);
|
|
});
|
|
|
|
it('while true {} keeps EXIT reverse-reachable AND emits CDG > 0', () => {
|
|
// The inner `if` is a real control point; assert through the production
|
|
// post-dom/CDG passes (matching go/python/ruby/rust/vue) — CDG is only
|
|
// computed when EXIT stays reverse-reachable, so a non-empty CDG proves the
|
|
// structural exit-escape edge keeps the function CDG-bearing.
|
|
const cfg = swift.cfgOf(`func f(x: Bool) { while true { if x { g() } } }`);
|
|
expect(edgeKinds(cfg).has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it('repeat {} while true keeps EXIT reverse-reachable', () => {
|
|
const cfg = swift.cfgOf(`func f() { repeat { work() } while true }`);
|
|
expect(edgeKinds(cfg).has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — switch (no implicit fallthrough)', () => {
|
|
it('a case without fallthrough rejoins after the switch (no fall into next case)', () => {
|
|
const cfg = swift.cfgOf(`func f(x: Int) {
|
|
switch x {
|
|
case 1: one()
|
|
case 2: two()
|
|
default: other()
|
|
}
|
|
after()
|
|
}`);
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
// case 1 does NOT fall into case 2 (Swift has no implicit fallthrough).
|
|
expect(reaches(cfg, block(cfg, 'one()'), block(cfg, 'two()'))).toBe(false);
|
|
// every case reaches the post-switch continuation.
|
|
expect(reaches(cfg, block(cfg, 'one()'), block(cfg, 'after()'))).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'two()'), block(cfg, 'after()'))).toBe(true);
|
|
});
|
|
|
|
it('an explicit `fallthrough` spills into the next case', () => {
|
|
const cfg = swift.cfgOf(`func f(x: Int) {
|
|
switch x {
|
|
case 1:
|
|
one()
|
|
fallthrough
|
|
case 2:
|
|
two()
|
|
default:
|
|
other()
|
|
}
|
|
after()
|
|
}`);
|
|
expect(edgeKinds(cfg).has('fallthrough')).toBe(true);
|
|
// case 1 (explicit fallthrough) FALLS THROUGH into case 2.
|
|
expect(reaches(cfg, block(cfg, 'one()'), block(cfg, 'two()'))).toBe(true);
|
|
});
|
|
|
|
it('a `where` guard on a case is harvested onto the dispatch block', () => {
|
|
const cfg = swift.cfgOf(`func f(x: Int) {
|
|
switch x {
|
|
case let n where n > 0: pos()
|
|
default: other()
|
|
}
|
|
}`);
|
|
// `x` (the subject) is used at the dispatch; the where guard uses are harvested.
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(reachable(cfg, block(cfg, 'pos()'))).toBe(true);
|
|
expect(reachable(cfg, block(cfg, 'other()'))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — value-position if/switch (Swift 5.9, #2207)', () => {
|
|
const hasDef = (cfg: FunctionCfg, idx: number): boolean =>
|
|
cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(idx)));
|
|
const hasUse = (cfg: FunctionCfg, idx: number): boolean =>
|
|
cfg.blocks.some((bl) => bl.statements?.some((s) => s.uses.includes(idx)));
|
|
|
|
it('`let x = if … else …` is modeled as a branch; def bound at the join', () => {
|
|
const cfg = swift.cfgOf(`func f(v: Int) {
|
|
let x = if v > 0 { hi() } else { lo() }
|
|
use(x)
|
|
}`);
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(true);
|
|
expect(edgeKinds(cfg).has('cond-false')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'hi()'), block(cfg, 'use(x)'))).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'lo()'), block(cfg, 'use(x)'))).toBe(true);
|
|
const x = bindingIdx(cfg, 'x');
|
|
expect(hasDef(cfg, x)).toBe(true);
|
|
expect(hasUse(cfg, x)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('`let y = switch v { … }` is modeled as a dispatch', () => {
|
|
const cfg = swift.cfgOf(`func f(v: Int) {
|
|
let y = switch v { case 1: one() ; default: other() }
|
|
use(y)
|
|
}`);
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'one()'), block(cfg, 'use(y)'))).toBe(true);
|
|
const y = bindingIdx(cfg, 'y');
|
|
expect(hasDef(cfg, y)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('`return if … else …` models each arm as returning the result', () => {
|
|
const cfg = swift.cfgOf(`func f(v: Int) -> Int {
|
|
return if v > 0 { a() } else { b() }
|
|
}`);
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(true);
|
|
expect(edgeKinds(cfg).has('return')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'a()'), cfg.exitIndex)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'b()'), cfg.exitIndex)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('an else-less `if` value / plain binding stays inline (no real control dependence)', () => {
|
|
// `let x = g()` is a plain binding — no branch.
|
|
const cfg = swift.cfgOf(`func f(v: Int) { let x = g()\n use(x) }`);
|
|
expect(edgeKinds(cfg).has('cond-true')).toBe(false);
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(false);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('a single-entry value switch stays inline (below the >= 2 modeling threshold) (#2211)', () => {
|
|
// `isModelableValueBranch` requires >= 2 `switch_entry`; a one-entry value
|
|
// switch carries no real control dependence, so the decl coalesces inline.
|
|
const cfg = swift.cfgOf(`func f(v: Int) { let x = switch v { default: g() }\n use(x) }`);
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(false);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — do/catch (error handling)', () => {
|
|
it('do/catch: a throw edge runs from each protected block to the handler', () => {
|
|
const cfg = swift.cfgOf(`func f() {
|
|
do { try risky() ; deeper() } catch let e { handle(e) }
|
|
after()
|
|
}`);
|
|
expect(edgeKinds(cfg).has('throw')).toBe(true);
|
|
const handler = block(cfg, 'handle(e)');
|
|
expect(reaches(cfg, block(cfg, 'try risky()'), handler)).toBe(true);
|
|
// after() is still reachable (handler completion rejoins).
|
|
expect(reachable(cfg, block(cfg, 'after()'))).toBe(true);
|
|
// the catch binds the error `e`.
|
|
const e = bindingIdx(cfg, 'e');
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(e)))).toBe(true);
|
|
});
|
|
|
|
it('a throw with NO enclosing do/catch routes to EXIT and ends its block', () => {
|
|
const cfg = swift.cfgOf(`func f(x: Bool) throws { if x { throw E.bad } ; done() }`);
|
|
const thr = block(cfg, 'throw E.bad');
|
|
expect(cfg.edges).toContainEqual({ from: thr, to: cfg.exitIndex, kind: 'throw' });
|
|
// throw terminates its block — control does not fall into done() from it.
|
|
expect(reaches(cfg, thr, block(cfg, 'done()'))).toBe(false);
|
|
expect(reachable(cfg, block(cfg, 'done()'))).toBe(true); // via the if false branch
|
|
});
|
|
|
|
it('multi-catch: EVERY catch handler is reachable from ENTRY (#2195)', () => {
|
|
// The protected body can throw an error matching ANY clause, so the 2nd..Nth
|
|
// catch must not be orphaned — the bug routed the throw edge only to the
|
|
// first handler, leaving later handlers unreachable from ENTRY.
|
|
const cfg = swift.cfgOf(`func f() { do { try r() } catch A { ha() } catch { hb() } }`);
|
|
expect(reachable(cfg, block(cfg, 'ha()'))).toBe(true);
|
|
expect(reachable(cfg, block(cfg, 'hb()'))).toBe(true);
|
|
// the protected `try r()` reaches both handlers.
|
|
expect(reaches(cfg, block(cfg, 'try r()'), block(cfg, 'hb()'))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — defer (LIFO scope-exit)', () => {
|
|
it('a defer runs at scope exit: the return threads through the deferred block', () => {
|
|
const cfg = swift.cfgOf(`func f() { defer { cleanup() } ; work() ; return }`);
|
|
const kinds = edgeKinds(cfg);
|
|
// The deferred completion threads as return + finally-return.
|
|
expect(kinds.has('return')).toBe(true);
|
|
const deferBlk = block(cfg, 'defer { cleanup() }');
|
|
// The deferred block reaches EXIT (it runs on scope exit).
|
|
expect(reaches(cfg, deferBlk, cfg.exitIndex)).toBe(true);
|
|
// The explicit return reaches the deferred block.
|
|
const ret = block(cfg, 'return');
|
|
expect(reaches(cfg, ret, deferBlk)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — labeled break/continue', () => {
|
|
it('labeled break targets the OUTER loop, not the inner one', () => {
|
|
const cfg = swift.cfgOf(`func f() {
|
|
outer: for i in xs {
|
|
for j in ys { break outer }
|
|
}
|
|
done()
|
|
}`);
|
|
const brk = block(cfg, 'break outer');
|
|
expect(edgeKinds(cfg).has('break')).toBe(true);
|
|
// the labeled break escapes BOTH loops and reaches done().
|
|
expect(reaches(cfg, brk, block(cfg, 'done()'))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — def/use harvest', () => {
|
|
it('let x = compute(); use(x) produces a def of x and a use in the consumer', () => {
|
|
const cfg = swift.cfgOf(`func f() { let x = compute() ; use(x) }`);
|
|
const x = bindingIdx(cfg, 'x');
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(x)))).toBe(true);
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.uses.includes(x)))).toBe(true);
|
|
});
|
|
|
|
it('tuple destructuring `let (a, b) = pair` defines both names', () => {
|
|
const cfg = swift.cfgOf(`func f(pair: (Int, Int)) { let (a, b) = pair ; use(a) ; use(b) }`);
|
|
for (const name of ['a', 'b']) {
|
|
const idx = bindingIdx(cfg, name);
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.defs.includes(idx)))).toBe(true);
|
|
}
|
|
});
|
|
|
|
it('closures are collected as their own CFG (opaque in the enclosing function)', () => {
|
|
const cfgs = swift.cfgsOf(`func f() { items.forEach { item in if item > 0 { use(item) } } }`);
|
|
// f and the closure are both CFG-bearing.
|
|
expect(cfgs.length).toBeGreaterThanOrEqual(2);
|
|
for (const cfg of cfgs) expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('switch `case let n` binds n as a (may-)def, not a synthetic global (#2195 P2)', () => {
|
|
const cfg = swift.cfgOf(
|
|
`func f(x: Int) { switch x { case let n where n > 0: use(n); default: break } }`,
|
|
);
|
|
const n = bindingIdx(cfg, 'n');
|
|
// The case value-binding defines n (a may-def — the case may not match);
|
|
// the bug left n a synthetic module binding with no def at all.
|
|
const defined = cfg.blocks.some((bl) =>
|
|
bl.statements?.some((s) => s.defs.includes(n) || (s.mayDefs ?? []).includes(n)),
|
|
);
|
|
expect(defined).toBe(true);
|
|
// use(n) (and the `where n > 0` guard) read n.
|
|
expect(cfg.blocks.some((bl) => bl.statements?.some((s) => s.uses.includes(n)))).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Swift CfgVisitor — functionStartColumn', () => {
|
|
it('two same-line functions get distinct functionStartColumn', () => {
|
|
const cfgs = swift.cfgsOf(`func a() { x() }; func b() { y() }`);
|
|
expect(cfgs).toHaveLength(2);
|
|
expect(cfgs[0].functionStartLine).toBe(cfgs[1].functionStartLine); // same line
|
|
expect(cfgs[0].functionStartColumn).not.toBe(cfgs[1].functionStartColumn); // distinct column
|
|
});
|
|
});
|