Skip to content

SwiftCompilerSources: move the Context and MutatingContext protocols from the Optimizer to the SIL module #83367

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

Jump to bottom
Merged
merged 10 commits into from
Jul 29, 2025
Merged

SwiftCompilerSources: move the Context and MutatingContext protocols from the Optimizer to the SIL module #83367

merged 10 commits into from
Jul 29, 2025
+2,562 −2,375

Conversation

eeckstein
Copy link
Contributor

@eeckstein eeckstein commented Jul 28, 2025 •
edited
Loading

This allows moving some basic SIL-related data structures and utilities from the Optimizer to the SIL module.
Also, all the SIL-modification APIs can now live in the SIL module.

| SIL                                | Optimizer                           |
| ------------------------------------------------------------------------ |
| Context protocols:                                                       |
|   `Context`                        | (<- moved)                          |
|   `MutatingContext`                | (<- moved)                          |
| ------------------------------------------------------------------------ |
| Context-conforming structs:                                              |
|                                    | `FunctionPassContext` (not changed) |
|                                    | `ModulePassContext`   (not changed) |
|                                    | `SimplifyContext`     (not changed) |
|   `TestContext` (new)              |                                     |
|   `VerifierContext` (new)          |                                     |
| ------------------------------------------------------------------------ |
| DataStructures:                                                          |
|   `InstructionRange`               | (<- moved)                          |
|   `BasicBlockRange`                | (<- moved)                          |
|   intrusive `Set`s                 | (<- moved)                          |
|   `Stack`                          | (<- moved)                          |
|   `Worklist`s                      | (<- moved)                          |
| ------------------------------------------------------------------------ |
| Utilities:                                                               |
|   `Test` (new, SIL-version of)     | `FunctionTest` (not changed)        |
|   `Verifier`                       | (<- moved)                          |
|   `ForwardingUtils`                | (<- moved)                          |
|   `BorrowUtils`                    | (<- moved)                          |
|   `SSAUpdater`                     | (<- moved)                          |
|   `PhiUpdater`                     | (<- moved)                          |
| ------------------------------------------------------------------------ |
| bridging:                                                                |
|   `SILContext` (new, baseclass of) | ` SwiftPassInvocation`              |

This a pure refactoring change. There is no functional change

@eeckstein eeckstein requested a review from jckarter as a code owner July 28, 2025 10:09
@eeckstein
Copy link
Contributor Author

@swift-ci smoke test

1 similar comment
@eeckstein
Copy link
Contributor Author

@swift-ci smoke test

eeckstein added 10 commits July 28, 2025 14:19
@eeckstein
SwiftCompilerSources: move the Context protocols from the Optimizer…
65c9828 
… to the SIL module

This allows to move many SIL APIs and utilities, which require a context, to the SIL module.

The SIL-part of SwiftPassInvocation is extracted into a base class SILContext which now lives in SIL.

Also: simplify the begin/end-pass functions of the SwiftPassInvocation.
@eeckstein
SwiftCompilerSources: move the SSAUpdater utility from the Optimizer …
e2129b5 
…to the SIL module
@eeckstein
SwiftCompilerSources: move SIL-related datastructures from the Optimi…
e89fdb5 
…zer to the SIL module
@eeckstein
SwiftCompilerSources: make the testing infrastructure available in th…
e95283b 
…e SIL module

add `Test`, which is the SIL-equivalent of `FunctionTest`.
It's invocation closure gets a `TestContext` instead of a `FunctionContext`.

^ The commit message #2 will be skipped:

^ - test
@eeckstein
SwiftCompilerSources: move the getAccessBaseTest to the SIL module
a767261
@eeckstein
SwiftCompilerSources: move ForwardingUtils and BorrowUtils to the SIL…
1eb49ec 
… module
@eeckstein
SwiftCompilerSources: move the Verifier to the SIL module
319f49a
@eeckstein
SwiftCompilerSources: move SIL-related Context APIs from Optimizer to…
41a6b8e 
… the SIL module
@eeckstein
SwiftCompilerSources: move PhiUpdater.swift from the Optimizer to the…
b38490b 
… SIL module
@eeckstein
SwiftCompilerSources: split the Optimizer/Context.swift file
3bbba99
@eeckstein
Copy link
Contributor Author

@swift-ci smoke test

@atrick
Copy link
Contributor

atrick commented Jul 28, 2025

I haven't looked through the diffs but I strongly support these changes. Thanks!

@eeckstein
Copy link
Contributor Author

@swift-ci smoke test windows

@eeckstein eeckstein merged commit 38711c6 into swiftlang:main Jul 29, 2025
3 checks passed
@eeckstein eeckstein deleted the context-refactor branch July 29, 2025 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jckarter jckarter Awaiting requested review from jckarter jckarter is a code owner

@atrick atrick Awaiting requested review from atrick

@meg-gupta meg-gupta Awaiting requested review from meg-gupta

@nate-chandler nate-chandler Awaiting requested review from nate-chandler

@MAJKFL MAJKFL Awaiting requested review from MAJKFL

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@eeckstein @atrick