Skip to content

[ClangImporter] -Xclang -fbuiltin-headers-in-system-modules is being passed when it shouldn't #73814

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
May 22, 2024

Conversation

al45tair
Copy link
Contributor

We were accidentally setting requiresBuiltinHeadersInSystemModules because the else here gets executed for things that are not WASI or Musl. Fix by making it conditional.

rdar://128219177

…g passed when it shouldn't

We were accidentally setting `requiresBuiltinHeadersInSystemModules` because
the `else` here gets executed for things that are not WASI or Musl.  Fix
by making it conditional.

rdar://128219177
@al45tair
Copy link
Contributor Author

@swift-ci Please smoke test

@al45tair al45tair merged commit 3a3380f into swiftlang:main May 22, 2024
3 checks passed
@ian-twilightcoder
Copy link
Contributor

This is a good change, but getLibcFileMapping can return {} for other reasons than target mismatches. I think we need to restore requiresBuiltinHeadersInSystemModules = !libcFileMapping.empty()

@al45tair
Copy link
Contributor Author

It can, but I believe those are all failure cases that we wouldn't expect to see in practice (unlike the target mismatch).

@ian-twilightcoder
Copy link
Contributor

Still makes me nervous, but ok.

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.

3 participants