Skip to content

[AST] only recurse getDisplayDecls in SymbolGraphGen #41204

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 1 commit into from
Feb 19, 2022
Merged

[AST] only recurse getDisplayDecls in SymbolGraphGen #41204

merged 1 commit into from
Feb 19, 2022

Conversation

QuietMisdreavus
Copy link
Contributor

This is a forward-port of part of #40866 from release/5.6 to main, restricting the recursive parts of ModuleDecl::getDisplayDecls (and the associated assertions) behind a (new, optional) recursive parameter, which is only set to true when called from SymbolGraphGen. This restores the old "only this module" behavior for all other users of getDisplayDecls, while allowing the symbol graph to include re-exported symbols.

@QuietMisdreavus
Copy link
Contributor Author

I've based this PR atop #41115, since the patch assumed that content but it has not been merged into main.

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test source compatibility

@swift-ci
Copy link
Contributor

swift-ci commented Feb 4, 2022

Build failed
Swift Test Linux Platform
Git Sha - a939350

@QuietMisdreavus
Copy link
Contributor Author

...apparently using a nonstandard base branch confuses the CI system, which tries to check out the base branch on several related repos. Then the script fails because (for example) swift-markdown does not have a QuietMisdreavus/duplicate-clang-syms branch. Interesting, but this means i need to have an unrelated commit in the PR to run CI.

@QuietMisdreavus QuietMisdreavus changed the base branch from QuietMisdreavus/duplicate-clang-syms to main February 4, 2022 17:05
@QuietMisdreavus
Copy link
Contributor Author

I've re-targeted the PR to point directly to main so that i can run CI.

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test source compatibility

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test macOS

@swift-ci
Copy link
Contributor

swift-ci commented Feb 4, 2022

Build failed
Swift Test Linux Platform
Git Sha - a939350

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test Linux

This was referenced Feb 19, 2022
Merged
Merged
@QuietMisdreavus QuietMisdreavus force-pushed the QuietMisdreavus/display-recur-symgraph branch from a939350 to cab1669 Compare February 19, 2022 17:32
@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test

@QuietMisdreavus QuietMisdreavus merged commit 8d37cdf into main Feb 19, 2022
@QuietMisdreavus QuietMisdreavus deleted the QuietMisdreavus/display-recur-symgraph branch February 19, 2022 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@DougGregor DougGregor Awaiting requested review from DougGregor

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
@QuietMisdreavus @swift-ci