Skip to content

WIP: [importer] Adjust for new dependency scanner API #60882

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 2 commits into from
Sep 29, 2022

Conversation

jansvoboda11
Copy link
Contributor

This PR updates the dependency scanner, reflecting changes made to Clang in swiftlang/llvm-project#5234.

@artemcm
Copy link
Contributor

artemcm commented Sep 12, 2022

Sorry #60807 introduced a merge conflict here.

@jansvoboda11 jansvoboda11 force-pushed the jan_svoboda/cherry-pick branch 2 times, most recently from 253c29b to 5a066d2 Compare September 16, 2022 16:39
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.

This is good to land, since swift-driver currently overloads -o for PCM generation. But in the future we will look to use this flow instead for determining the ultimate PCM destination paths.

@artemcm
Copy link
Contributor

artemcm commented Sep 21, 2022

This is good to land, since swift-driver currently overloads -o for PCM generation. But in the future we will look to use this flow instead for determining the ultimate PCM destination paths.

This is, in fact, not good to land.
The change of clang scan-deps to emit cc1 arguments will take some rearchitecting on the Swift side.

artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 26, 2022
…s with the output path.

swiftlang/swift#60882 adds functionality to the Clang scan-deps invocation that produces placeholder paths as '<replace-me>'s in the generated command-line.
The first step to adapting to these changes is to teach the driver to substitute the expected file paths.

Once the scanner changes land, we will revisit the driver specifying these paths in favour of having the scanning action being able to determine the correct output location from the get-go.
artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 26, 2022
…s with the output path.

swiftlang/swift#60882 adds functionality to the Clang scan-deps invocation that produces placeholder paths as '<replace-me>'s in the generated command-line.
The first step to adapting to these changes is to teach the driver to substitute the expected file paths.

Once the scanner changes land, we will revisit the driver specifying these paths in favour of having the scanning action being able to determine the correct output location from the get-go.
artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 26, 2022
…s with the output path.

swiftlang/swift#60882 adds functionality to the Clang scan-deps invocation that produces placeholder paths as '<replace-me>'s in the generated command-line.
The first step to adapting to these changes is to teach the driver to substitute the expected file paths.

Once the scanner changes land, we will revisit the driver specifying these paths in favour of having the scanning action being able to determine the correct output location from the get-go.
artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 26, 2022
…s with the output path.

swiftlang/swift#60882 adds functionality to the Clang scan-deps invocation that produces placeholder paths as '<replace-me>'s in the generated command-line.
The first step to adapting to these changes is to teach the driver to substitute the expected file paths.

Once the scanner changes land, we will revisit the driver specifying these paths in favour of having the scanning action being able to determine the correct output location from the get-go.
artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 27, 2022
As of swiftlang/swift#60882 and swiftlang/swift#61303, emit-pcm will accept clang frontend arguments with '-Xcc', instead of clang driver arguments.
artemcm added a commit to artemcm/swift-driver that referenced this pull request Sep 27, 2022
As of swiftlang/swift#60882 and swiftlang/swift#61303, emit-pcm will accept clang frontend arguments with '-Xcc', instead of clang driver arguments.
@artemcm artemcm force-pushed the jan_svoboda/cherry-pick branch from 5a066d2 to 47db857 Compare September 27, 2022 17:26
@artemcm artemcm force-pushed the jan_svoboda/cherry-pick branch 2 times, most recently from 5a066d2 to 80440ee Compare September 27, 2022 22:56
@artemcm
Copy link
Contributor

artemcm commented Sep 27, 2022

…clang frontend-only results coming from scan-deps
@artemcm artemcm force-pushed the jan_svoboda/cherry-pick branch from 80440ee to c5bd61b Compare September 28, 2022 16:01
@artemcm
Copy link
Contributor

artemcm commented Sep 28, 2022

1 similar comment
@artemcm
Copy link
Contributor

artemcm commented Sep 28, 2022

swiftlang/llvm-project#5234
@swift-ci test

@artemcm
Copy link
Contributor

artemcm commented Sep 28, 2022

swiftlang/llvm-project#5234
@swift-ci test Windows platform

@artemcm artemcm merged commit af276b7 into main Sep 29, 2022
@artemcm artemcm deleted the jan_svoboda/cherry-pick branch September 29, 2022 17:20
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