mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-10-01 02:01:24 +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>
430 lines
19 KiB
TypeScript
430 lines
19 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import { createRequire } from 'node:module';
|
|
import { createPhpCfgVisitor } from '../../../src/core/ingestion/cfg/visitors/php.js';
|
|
import type { FunctionCfg } from '../../../src/core/ingestion/cfg/types.js';
|
|
import {
|
|
makeCfgHarness,
|
|
type CfgHarness,
|
|
block,
|
|
edgeKinds,
|
|
reaches,
|
|
reachable,
|
|
bindingIdx,
|
|
allSites,
|
|
} 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 PHP CfgVisitor, one hazard per test (real-parser regression, NOT
|
|
// snapshot-pinning). Each fixture's distinctive statement text (a(), step(),
|
|
// handle($e), …) lets us locate the block for a region by text and assert the
|
|
// control-flow topology around it. tree-sitter-php's runtime grammar is the
|
|
// `php_only` export (matching parser-loader.ts).
|
|
|
|
const phpGrammar = (createRequire(import.meta.url)('tree-sitter-php') as { php_only: unknown })
|
|
.php_only as Parameters<typeof makeCfgHarness>[0];
|
|
|
|
const php: CfgHarness = makeCfgHarness(phpGrammar, createPhpCfgVisitor(), 'fixture.php');
|
|
|
|
const wrap = (body: string): string => `<?php function f($x) { ${body} }`;
|
|
|
|
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)));
|
|
const hasMayDef = (cfg: FunctionCfg, idx: number): boolean =>
|
|
cfg.blocks.some((bl) => bl.statements?.some((s) => (s.mayDefs ?? []).includes(idx)));
|
|
|
|
describe('PHP CfgVisitor — structure', () => {
|
|
it('straight-line body: ENTRY → block → EXIT (seq)', () => {
|
|
const cfg = php.cfgOf(`<?php function 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 = php.cfgOf(`<?php function f() {}`);
|
|
expect(cfg.blocks).toHaveLength(2);
|
|
expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('method, anonymous function, and arrow function are CFG-bearing', () => {
|
|
const cfgs = php.cfgsOf(
|
|
`<?php class C { public function m($a) { return $a; } }
|
|
$clo = function ($b) { return $b; };
|
|
$arr = fn ($c) => $c * 2;`,
|
|
);
|
|
// method m, the closure, and the arrow = 3 CFGs.
|
|
expect(cfgs.length).toBeGreaterThanOrEqual(3);
|
|
for (const cfg of cfgs) expect(reaches(cfg, cfg.entryIndex, cfg.exitIndex)).toBe(true);
|
|
});
|
|
|
|
it('arrow function: one block returns its expression value', () => {
|
|
const cfgs = php.cfgsOf(`<?php $g = fn ($z) => $z * 2;`);
|
|
const arrow = cfgs.find((c) => c.blocks.some((b) => b.text === '$z * 2'));
|
|
expect(arrow).toBeDefined();
|
|
const body = arrow!.blocks.find((b) => b.text === '$z * 2')!.index;
|
|
expect(arrow!.edges).toContainEqual({ from: body, to: arrow!.exitIndex, kind: 'return' });
|
|
});
|
|
|
|
it('abstract method (no body) → graceful undefined, no throw', () => {
|
|
const root = php.parse(`<?php abstract class C { abstract public function m(); }`);
|
|
const fns = php.collectFunctions(root);
|
|
for (const fn of fns) {
|
|
expect(() => createPhpCfgVisitor().buildFunctionCfg(fn, 'x.php')).not.toThrow();
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — branching', () => {
|
|
it('if / elseif / else → cond-true & cond-false; join reachable', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`if ($x > 0) { pos(); } elseif ($x < 0) { neg(); } else { zero(); } after();`),
|
|
);
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
const after = block(cfg, 'after();');
|
|
expect(reaches(cfg, block(cfg, 'pos();'), after)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'neg();'), after)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'zero();'), after)).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('alternative colon if/elseif/else (endif) is modeled like the brace form', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`if ($x): pos(); elseif ($x): mid(); else: zero(); endif; after();`),
|
|
);
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
const after = block(cfg, 'after();');
|
|
expect(reaches(cfg, block(cfg, 'pos();'), after)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'zero();'), after)).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — loops', () => {
|
|
it('for: cond-true / loop-back / cond-false; body loops back', () => {
|
|
const cfg = php.cfgOf(wrap(`for ($i = 0; $i < $x; $i++) { body(); } after();`));
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('loop-back')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'body();'), block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('foreach ($it as $v): loops with cond-true / loop-back / cond-false', () => {
|
|
const cfg = php.cfgOf(wrap(`foreach ($x as $v) { use1($v); } after();`));
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('loop-back')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('while: cond-true / loop-back / cond-false', () => {
|
|
const cfg = php.cfgOf(wrap(`while ($x > 0) { tick(); } after();`));
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('cond-true')).toBe(true);
|
|
expect(kinds.has('loop-back')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('do-while: body runs before the test (loop-back from the condition)', () => {
|
|
const cfg = php.cfgOf(wrap(`do { tick(); } while ($x < 3); after();`));
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('loop-back')).toBe(true);
|
|
expect(kinds.has('cond-false')).toBe(true);
|
|
// The body is the loop entry — control reaches it before the condition.
|
|
const body = block(cfg, 'tick();');
|
|
expect(reachable(cfg, body)).toBe(true);
|
|
expect(reaches(cfg, body, block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('while (true) {} keeps EXIT reverse-reachable AND emits CDG > 0', () => {
|
|
const cfg = php.cfgOf(wrap(`while (true) { if ($x) { g(); } }`));
|
|
// 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 cond-false escape edge keeps the function CDG-bearing.
|
|
expect(edgeKinds(cfg).has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it('for (;;) {} (no condition) keeps EXIT reverse-reachable', () => {
|
|
const cfg = php.cfgOf(wrap(`for (;;) { step(); }`));
|
|
expect(edgeKinds(cfg).has('cond-false')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — switch / match', () => {
|
|
it('switch: C-style FALLTHROUGH (a case with no break flows to the next)', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(
|
|
`switch ($x) { case 1: a(); break; case 2: b(); case 3: c(); break; default: d(); } e();`,
|
|
),
|
|
);
|
|
const kinds = edgeKinds(cfg);
|
|
expect(kinds.has('switch-case')).toBe(true);
|
|
expect(kinds.has('fallthrough')).toBe(true);
|
|
// case 2 (no break) falls through to case 3.
|
|
const c2 = block(cfg, 'b();');
|
|
const c3 = block(cfg, 'c();');
|
|
expect(cfg.edges).toContainEqual({ from: c2, to: c3, kind: 'fallthrough' });
|
|
// case 1's break skips case 2's body, but the switch join is reachable.
|
|
expect(reaches(cfg, block(cfg, 'a();'), block(cfg, 'e();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('switch without break: no switch-case edge is mislabeled fallthrough at the dispatch', () => {
|
|
const cfg = php.cfgOf(wrap(`switch ($x) { case 1: a(); } after();`));
|
|
// No default → the no-match path reaches the join directly.
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'a();'), block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('value-position match assignment dispatches; target bound at the join (#2207)', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`$r = match ($x) { 1, 2 => low($x), default => high() }; use_it($r);`),
|
|
);
|
|
// arms dispatch as switch-case, never fall through.
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(edgeKinds(cfg).has('fallthrough')).toBe(false);
|
|
// each arm rejoins and reaches the downstream use of the bound result.
|
|
expect(reaches(cfg, block(cfg, 'low($x)'), block(cfg, 'use_it($r)'))).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'high()'), block(cfg, 'use_it($r)'))).toBe(true);
|
|
const r = bindingIdx(cfg, '$r');
|
|
expect(hasDef(cfg, r)).toBe(true);
|
|
expect(hasUse(cfg, r)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('return match (…) models each arm as returning the result (#2207)', () => {
|
|
const cfg = php.cfgOf(wrap(`return match ($x) { 1 => a($x), 2 => b(), default => c() };`));
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(edgeKinds(cfg).has('return')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'a($x)'), cfg.exitIndex)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'c()'), cfg.exitIndex)).toBe(true);
|
|
expect(computeControlDependence(cfg).edges.length).toBeGreaterThan(0);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('single-arm match / ternary stays inline (no real control dependence)', () => {
|
|
const oneArm = php.cfgOf(wrap(`$r = match ($x) { default => 0 }; return $r;`));
|
|
expect(edgeKinds(oneArm).has('switch-case')).toBe(false);
|
|
const ternary = php.cfgOf(wrap(`$r = $x > 0 ? a() : b(); return $r;`));
|
|
expect(edgeKinds(ternary).has('switch-case')).toBe(false);
|
|
expect(isExitReachableFromAllBlocks(ternary)).toBe(true);
|
|
});
|
|
|
|
it('match without `default` keeps a no-match (UnhandledMatchError) edge; EXIT reachable (#2211)', () => {
|
|
const cfg = php.cfgOf(wrap(`$r = match ($x) { 1 => a($x), 2 => b() }; use_it($r);`));
|
|
expect(edgeKinds(cfg).has('switch-case')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
// 2 arms + the conservative no-match path = 3 switch-case successors from the dispatch.
|
|
const dispatchIdx = block(cfg, '$x');
|
|
expect(cfg.edges.filter((e) => e.from === dispatchIdx && e.kind === 'switch-case').length).toBe(
|
|
3,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — try / catch / finally', () => {
|
|
it('try/catch/finally: throw edges to the handler; normal flow crosses finally', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`try { risky(); } catch (\\E $e) { handle($e); } finally { cleanup(); } after();`),
|
|
);
|
|
expect(edgeKinds(cfg).has('throw')).toBe(true);
|
|
// Body and catch both reach the finally, then after().
|
|
const fin = block(cfg, 'cleanup();');
|
|
expect(reaches(cfg, block(cfg, 'risky();'), fin)).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'handle($e)'), fin)).toBe(true);
|
|
expect(reaches(cfg, fin, block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('multi-catch type list (TypeError | ValueError) catches and reaches the join', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`try { risky(); } catch (\\TypeError | \\ValueError $e) { handle($e); } after();`),
|
|
);
|
|
expect(edgeKinds(cfg).has('throw')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'handle($e)'), block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('return inside try threads through finally (finally-return completion edge)', () => {
|
|
const cfg = php.cfgOf(
|
|
wrap(`try { if ($x) { return early(); } body(); } finally { release(); } return tail();`),
|
|
);
|
|
expect(edgeKinds(cfg).has('finally-return')).toBe(true);
|
|
// The early return's first leg goes to the finally entry, not straight to EXIT.
|
|
const ret = block(cfg, 'return early()');
|
|
const fin = block(cfg, 'release();');
|
|
expect(reaches(cfg, ret, fin)).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — break N / continue N', () => {
|
|
it('break 2 targets the 2nd enclosing loop (escapes both)', () => {
|
|
const cfg = php.cfgOf(
|
|
`<?php function f() {
|
|
while (true) {
|
|
for ($i = 0; ; $i++) {
|
|
if (cond()) { break 2; }
|
|
inner();
|
|
}
|
|
afterInner();
|
|
}
|
|
afterOuter();
|
|
}`,
|
|
);
|
|
expect(edgeKinds(cfg).has('break')).toBe(true);
|
|
const brk = block(cfg, 'break 2');
|
|
// break 2 escapes the OUTER loop → reaches afterOuter(), NOT afterInner().
|
|
expect(reaches(cfg, brk, block(cfg, 'afterOuter();'))).toBe(true);
|
|
expect(reaches(cfg, brk, block(cfg, 'afterInner();'))).toBe(false);
|
|
});
|
|
|
|
it('continue 2 targets the 2nd enclosing loop header', () => {
|
|
const cfg = php.cfgOf(
|
|
`<?php function f() {
|
|
while (cond1()) {
|
|
for ($i = 0; $i < 3; $i++) {
|
|
if (cond2()) { continue 2; }
|
|
inner();
|
|
}
|
|
}
|
|
done();
|
|
}`,
|
|
);
|
|
expect(edgeKinds(cfg).has('continue')).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('bare break targets the nearest loop', () => {
|
|
const cfg = php.cfgOf(wrap(`while ($x) { if ($x) { break; } step(); } after();`));
|
|
expect(edgeKinds(cfg).has('break')).toBe(true);
|
|
expect(reaches(cfg, block(cfg, 'break;'), block(cfg, 'after();'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — def/use harvest', () => {
|
|
it('$x = $a defines $x and uses $a', () => {
|
|
const cfg = php.cfgOf(`<?php function f($a) { $x = $a; }`);
|
|
expect(hasDef(cfg, bindingIdx(cfg, '$x'))).toBe(true);
|
|
expect(hasUse(cfg, bindingIdx(cfg, '$a'))).toBe(true);
|
|
});
|
|
|
|
it('[$a, $b] = f() and list($c, $d) = g() define all targets', () => {
|
|
const cfg = php.cfgOf(`<?php function f() { [$a, $b] = h(); list($c, $d) = g(); }`);
|
|
for (const name of ['$a', '$b', '$c', '$d']) {
|
|
expect(hasDef(cfg, bindingIdx(cfg, name))).toBe(true);
|
|
}
|
|
});
|
|
|
|
it('foreach ($it as $k => $v) defines both $k and $v', () => {
|
|
const cfg = php.cfgOf(`<?php function f($it) { foreach ($it as $k => $v) { use1($k, $v); } }`);
|
|
expect(hasDef(cfg, bindingIdx(cfg, '$k'))).toBe(true);
|
|
expect(hasDef(cfg, bindingIdx(cfg, '$v'))).toBe(true);
|
|
expect(hasUse(cfg, bindingIdx(cfg, '$it'))).toBe(true);
|
|
});
|
|
|
|
it('catch (T $e) defines the exception variable', () => {
|
|
const cfg = php.cfgOf(`<?php function f() { try { r(); } catch (\\E $e) { log($e); } }`);
|
|
expect(hasDef(cfg, bindingIdx(cfg, '$e'))).toBe(true);
|
|
});
|
|
|
|
it('parameters (incl. default, variadic, by-ref) are ENTRY defs', () => {
|
|
const cfg = php.cfgOf(`<?php function f($a, $b = 1, &$c, ...$rest) { use1($a); }`);
|
|
for (const name of ['$a', '$b', '$c', '$rest']) {
|
|
expect(hasDef(cfg, bindingIdx(cfg, name))).toBe(true);
|
|
}
|
|
});
|
|
|
|
it('conditional def (right of &&) is a may-def, not a must-def', () => {
|
|
const cfg = php.cfgOf(`<?php function f($a) { $r = $a && ($x = load()); }`);
|
|
const x = bindingIdx(cfg, '$x');
|
|
expect(hasMayDef(cfg, x)).toBe(true);
|
|
expect(hasDef(cfg, x)).toBe(false);
|
|
});
|
|
|
|
it('property write ($o->p = v) is NOT a scalar def — $o is a use only', () => {
|
|
// $o is a local (not a param) so the only def site that could exist is the
|
|
// member-write itself — which must NOT count as a scalar def.
|
|
const cfg = php.cfgOf(`<?php function f() { $o = make(); $o->prop = compute(); }`);
|
|
expect(hasUse(cfg, bindingIdx(cfg, '$o'))).toBe(true);
|
|
// The member-write defines no scalar binding for `prop` — it never appears
|
|
// as a binding name in the table.
|
|
expect((cfg.bindings ?? []).some((b) => b.name === 'prop' || b.name === '$prop')).toBe(false);
|
|
});
|
|
|
|
it('closure use ($b, &$c) captures bind in the closure body', () => {
|
|
const cfgs = php.cfgsOf(
|
|
`<?php function outer($b) { return function ($a) use ($b, &$c) { return $a + $b + $c; }; }`,
|
|
);
|
|
const closure = cfgs.find((c) => (c.bindings ?? []).some((bd) => bd.name === '$a'));
|
|
expect(closure).toBeDefined();
|
|
expect((closure!.bindings ?? []).some((bd) => bd.name === '$b')).toBe(true);
|
|
expect((closure!.bindings ?? []).some((bd) => bd.name === '$c')).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — taint-site substrate', () => {
|
|
it('records a call site with a callee path for a function call', () => {
|
|
const cfg = php.cfgOf(`<?php function f($req) { exec($req); }`);
|
|
const sites = allSites(cfg);
|
|
expect(sites.some((s) => s.kind === 'call' && s.callee === 'exec')).toBe(true);
|
|
});
|
|
|
|
it('records a member-call receiver + callee (db->query)', () => {
|
|
const cfg = php.cfgOf(`<?php function f($req) { $db->query($req); }`);
|
|
const sites = allSites(cfg);
|
|
const call = sites.find((s) => s.kind === 'call' && (s.callee ?? '').endsWith('query'));
|
|
expect(call).toBeDefined();
|
|
expect(call!.receiver).toBe(bindingIdx(cfg, '$db'));
|
|
});
|
|
|
|
it('nested sanitizer call exec(escape($req)) is via-tagged for interposition', () => {
|
|
const cfg = php.cfgOf(`<?php function f($req) { exec(escape($req)); }`);
|
|
const sites = allSites(cfg);
|
|
expect(sites.some((s) => s.callee === 'exec')).toBe(true);
|
|
expect(sites.some((s) => s.callee === 'escape')).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('PHP CfgVisitor — robustness', () => {
|
|
it('unmodeled / malformed body shape → graceful partial CFG, never throws', () => {
|
|
// Deeply nested + a syntax-error tail. The visitor must not throw out.
|
|
const root = php.parse(`<?php function f($x) { if ($x) { while (true) { @@@ } } }`);
|
|
const fns = php.collectFunctions(root);
|
|
for (const fn of fns) {
|
|
expect(() => createPhpCfgVisitor().buildFunctionCfg(fn, 'x.php')).not.toThrow();
|
|
}
|
|
});
|
|
|
|
it('goto / named label are modeled as straight-line blocks (no crash)', () => {
|
|
const cfg = php.cfgOf(`<?php function f() { start(); goto end; end: done(); }`);
|
|
expect(reachable(cfg, block(cfg, 'done()'))).toBe(true);
|
|
expect(isExitReachableFromAllBlocks(cfg)).toBe(true);
|
|
});
|
|
|
|
it('a truncated value-position match never throws out of the carrier path (R4) (#2211)', () => {
|
|
const root = php.parse(`<?php function f($x){ $r = match ($x) { 1 => a(`);
|
|
for (const fn of php.collectFunctions(root)) {
|
|
expect(() => createPhpCfgVisitor().buildFunctionCfg(fn, 'x.php')).not.toThrow();
|
|
}
|
|
});
|
|
});
|