Skip to content

Unified: Track all local name kinds in one pass #22284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asgerf merged 20 commits into from
Aug 6, 2026
Merged

Unified: Track all local name kinds in one pass #22284

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cea1106
unified: Fix extraction of type parameter bounds and constraints
asgerf Aug 5, 2026
e0e3406
unified: Support . in name test annotations
asgerf Aug 5, 2026
eef277a
unified: Add more local name binding test cases
asgerf Aug 5, 2026
3b51c4c
unified: add MISSING annotations
asgerf Aug 5, 2026
7d1b1e4
unified: Track more kinds of names as local variables
asgerf Aug 5, 2026
5d851e4
unified: More precise scoping inside classes
asgerf Aug 5, 2026
3e25c6a
unified: Rename Variables.qll -> LocalNameBinding.qll
asgerf Aug 5, 2026
6df74d7
unified: Rename 'variables' test
asgerf Aug 5, 2026
686a07d
unified: Rename 'Variable' API to use LocalName terminology
asgerf Aug 5, 2026
a5faaef
unified: Two refactorings
asgerf Aug 5, 2026
179ae25
unified: Also include declaration site access
asgerf Aug 5, 2026
427653e
unified: Replace getDefiningNode() with isDeclarationSite()
asgerf Aug 5, 2026
012b1ae
unified: Minor doc comment update
asgerf Aug 5, 2026
a3a54c3
unified: fix typo
asgerf Aug 5, 2026
6e89c7b
unified: Add mappings for type parameters on functions and type aliases
asgerf Aug 5, 2026
5a302d5
unified: Add name binding tests
asgerf Aug 5, 2026
74e46ba
unified: Add mappings for constructor calls with generic arguments
asgerf Aug 5, 2026
aaa2c1c
unified: Add test with generic constructor call
asgerf Aug 5, 2026
9a31d09
unified: Update debugScopeGraph.ql
asgerf Aug 6, 2026
08359ec
unified: Standardsize toString doc
asgerf Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions unified/extractor/src/languages/swift/swift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,19 +1065,51 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
// A nominal type's `inheritanceClause` (`: Base, Proto`) becomes a list
// of `base_type`s, one per inherited type. Each declaration keyword
// gets its own rule; the bodies are identical but for the keyword.
rule!(
(genericParameter
attributes: _* @attrs
specifier: _? @@spec
name: @@name
inheritedType: _? @bound)
Comment thread
asgerf marked this conversation as resolved.
=>
(type_parameter
modifier: {attrs}
modifier: (modifier #{spec})?
name: (identifier #{name})
bound: {bound})
),
rule!(
(genericRequirement
requirement: (conformanceRequirement leftType: @ty rightType: @bound))
=>
(bound_type_constraint type: {ty} bound: {bound})
),
rule!(
(genericRequirement
requirement: (sameTypeRequirement leftType: @left rightType: @right))
=>
(equality_type_constraint left: {left} right: {right})
),
// Class declaration with body containing members
rule!(
(classDecl
classKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1087,13 +1119,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
enumKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1103,13 +1142,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
structKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1119,13 +1165,17 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
protocolKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause parameters: _* @params)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand Down
94 changes: 94 additions & 0 deletions unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
class Box<T: Equatable, U> where U: Equatable, U == T {
}

---

sourceFile
endOfFileToken: endOfFile
statements:
codeBlockItem
item:
classDecl
attributes:
name: identifier "Box"
genericParameterClause:
genericParameterClause
parameters:
genericParameter
colon: :
attributes:
name: identifier "T"
trailingComma: ,
inheritedType:
identifierType
name: identifier "Equatable"
genericParameter
attributes:
name: identifier "U"
leftAngle: <
rightAngle: >
genericWhereClause:
genericWhereClause
requirements:
genericRequirement
trailingComma: ,
requirement:
conformanceRequirement
colon: :
leftType:
identifierType
name: identifier "U"
rightType:
identifierType
name: identifier "Equatable"
genericRequirement
requirement:
sameTypeRequirement
equal: binaryOperator "=="
leftType:
identifierType
name: identifier "U"
rightType:
identifierType
name: identifier "T"
whereKeyword: where
memberBlock:
memberBlock
leftBrace: {
rightBrace: }
members:
modifiers:
classKeyword: class

---

top_level
body:
block
stmt:
class_like_declaration
modifier: modifier "class"
name: identifier "Box"
type_parameter:
type_parameter
name: identifier "T"
bound:
named_type_expr
name: identifier "Equatable"
type_parameter
name: identifier "U"
type_constraint:
bound_type_constraint
type:
named_type_expr
name: identifier "U"
bound:
named_type_expr
name: identifier "Equatable"
equality_type_constraint
left:
named_type_expr
name: identifier "U"
right:
named_type_expr
name: identifier "T"
2 changes: 2 additions & 0 deletions unified/extractor/tests/corpus/swift/types/generic-class-parameters-and-constraints.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class Box<T: Equatable, U> where U: Equatable, U == T {
}
5 changes: 5 additions & 0 deletions unified/ql/lib/codeql/unified/internal/AstExtra.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,9 @@ module Public {
result = this.getValue().regexpCapture("(?s)/\\*(.*)\\*/", 1)
}
}

/** A `Stmt` at the top-level. */
Comment thread
hvitved marked this conversation as resolved.
final class TopLevelStmt extends Stmt {
TopLevelStmt() { this = any(TopLevel t).getBody().getAStmt() }
}
}
Loading