Skip to content

[Driver][Frontend] add the symbol graph dir to the supplementary file map #36542

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.

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
merged 3 commits into from
Mar 25, 2021

Conversation

QuietMisdreavus
Copy link
Contributor

Resolves rdar://75582169

When the -emit-symbol-graph[-dir] flags were added to the driver, they were marked as supplementary outputs, but were not added to the supplementary output map. This PR adds the symbol graph output directory to the supplementary output file map, and updates the frontend to read the directory from the map if present.

A PR to integrate this change into swift-driver is forthcoming.

@QuietMisdreavus QuietMisdreavus requested a review from artemcm March 22, 2021 20:41
@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please smoke test

Copy link
Contributor

@artemcm artemcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good, thank you!

@QuietMisdreavus
Copy link
Contributor Author

The Linux CI failed on Driver/filelists.swift, which i did modify, but it failed in a part that i left alone (in fact, the part that i based my additions from!). While i get a build going on my local machine, i'm going to try to run it again, in case it was a fluke...

@swift-ci Please smoke test Linux platform

@QuietMisdreavus QuietMisdreavus force-pushed the QuietMisdreavus/supplementary-symbol-graph branch from 1fc08d5 to 89a8151 Compare March 24, 2021 21:51
@QuietMisdreavus
Copy link
Contributor Author

I have a hunch about the failing test. It seems like the output is capturing a warning of some kind on Linux that is interfering with the scan that picks up the file lists. I've tweaked the command lines for those lines to make it a bit more resilient to situations like that.

@swift-ci Please smoke test

@QuietMisdreavus
Copy link
Contributor Author

The Windows CI failed on concurrency tests, which i believe are being worked on elsewhere. I'm going ahead and merging this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants