Skip to content

Pass through file-compilation-dir to the ClangImporter. #68847

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 1 commit into from
Oct 30, 2023

Conversation

rmaz
Copy link
Contributor

@rmaz rmaz commented Sep 28, 2023

This change passes through the -file-compilation-dir flag to the ClangImporter instance as -ffile-compilation-dir. When used in conjunction with llvm/llvm-project#67744 this will allow for setting the compilation directory of pcm files using the -file-compilation-dir flag.

@adrian-prantl
Copy link
Contributor

This looks reasonable, but can you add a test case?

@rmaz
Copy link
Contributor Author

rmaz commented Sep 29, 2023

This looks reasonable, but can you add a test case?

I had trouble thinking what we could test. Until llvm/llvm-project#67744 is merged into the swift llvm branch there will be no observable behaviour change. Should I put up a PR for that first on apple/llvm-project?

@adrian-prantl
Copy link
Contributor

I think that would be best — you'll want to cherry-pick it to stable/20230725 which aligns with rebranch, which will become the new main soon.

@rmaz
Copy link
Contributor Author

rmaz commented Sep 29, 2023

Cherry-pick over here: swiftlang/llvm-project#7546

which aligns with rebranch, which will become the new main soon.

So I should sit on this until the rebranch is done then update with a test?

@adrian-prantl
Copy link
Contributor

Yeah, or land this on the rebranch branch before then.

This change passes through the -file-compilation-dir flag to the
ClangImporter instance as -ffile-compilation-dir. When used in
conjunction with llvm/llvm-project#67744
this will allow for setting the compilation directory of pcm
files using the -file-compilation-dir flag.
@rmaz rmaz force-pushed the filecompdirpassthrough branch from 9cf482e to 198d2ff Compare October 26, 2023 15:39
@rmaz
Copy link
Contributor Author

rmaz commented Oct 27, 2023

@swift-ci Please test

@rmaz
Copy link
Contributor Author

rmaz commented Oct 27, 2023

@swift-ci Please test Windows platform

@drodriguez
Copy link
Contributor

@shahmishal, @compnerd : the comment 4 hours ago left "Swift Test Windows Platform" in "Expected - Waiting for status to be reported". I don't know if you are still tracking those or not.

@shahmishal
Copy link
Member

@swift-ci Please test Windows platform

@rmaz rmaz merged commit 3d8e4b9 into swiftlang:main Oct 30, 2023
@rmaz rmaz deleted the filecompdirpassthrough branch October 30, 2023 14:12
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.

4 participants