Skip to content

[ClangImporter] Fix Build Break Due to clang API changes #84925

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 3 commits into from
Oct 27, 2025
Merged

[ClangImporter] Fix Build Break Due to clang API changes #84925

merged 3 commits into from
Oct 27, 2025
+4 −6

Conversation

@qiongsiwu
Copy link
Contributor

@qiongsiwu qiongsiwu commented Oct 15, 2025 •
edited
Loading

swiftlang/llvm-project#11631 is cherry-picking clang commits that change CompilerInstance's APIs. The API changes are causing Swift build breaks. This PR fixes the API breaks.

@qiongsiwu qiongsiwu mentioned this pull request Oct 15, 2025
Merged
@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 15, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 15, 2025

swiftlang/llvm-project#11631

@swift-ci please test Windows

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 16, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 16, 2025

swiftlang/llvm-project#11631

@swift-ci please test Windows

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 17, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 17, 2025

swiftlang/llvm-project#11631

@swift-ci please test Windows

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 17, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

2 similar comments
@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 18, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 20, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 20, 2025

The macOS failure could be dependency scanning related (https://ci.swift.org/job/swift-PR-macos-smoke-test/23721/consoleFull). Specifically, the error is _Builtin_stdint-AQKSPIMLZOESNDH73ZPMF2AZI.pcm' is out of date and needs to be rebuilt: module file has a different size than expected when we build LocalTestingDistributedActorSystem.swift. I cannot reproduce this failure on desk so far.

@nkcsgexi nkcsgexi mentioned this pull request Oct 20, 2025
Merged
@nkcsgexi
Copy link
Contributor

nkcsgexi commented Oct 20, 2025

Probably similar to #84995?

@artemcm
Copy link
Contributor

artemcm commented Oct 20, 2025

@swift-ci Please clean smoke test macOS platform

@artemcm
Copy link
Contributor

artemcm commented Oct 20, 2025

swiftlang/llvm-project#11631
@swift-ci Please clean smoke test macOS platform

@vanvoorden
Copy link
Contributor

vanvoorden commented Oct 21, 2025 •
edited
Loading

https://ci.swift.org/job/swift-PR-macos-smoke-test/23793/

[2025-10-21T19:11:28.306Z] error: generate-pcm command failed with exit code 1 (use -v to see invocation)
[2025-10-21T19:11:28.306Z] <module-includes>:1:9: note: in file included from <module-includes>:1:
[2025-10-21T19:11:28.306Z] 1 | #import "tgmath.h"
[2025-10-21T19:11:28.306Z]   |         `- note: in file included from <module-includes>:1:
[2025-10-21T19:11:28.306Z] 2 | 
[2025-10-21T19:11:28.306Z] 
[2025-10-21T19:11:28.306Z] 1 error generated.
[2025-10-21T19:11:28.306Z] /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/llvm-macosx-x86_64/lib/clang/21/include/tgmath.h:21:4: error: module file '/var/folders/bb/hcrjxg1s0b96pfst0ymhmp240000gn/C/clang/ModuleCache/_math-6X1XIJLGY09OU392JSQVQDTP4.pcm' is out of date and needs to be rebuilt: module file has a different size than expected
[2025-10-21T19:11:28.306Z]   19 |  */
[2025-10-21T19:11:28.306Z]   20 | #if defined(__APPLE__) && __STDC_HOSTED__ && __has_include_next(<tgmath.h>)
[2025-10-21T19:11:28.306Z]   21 | #  include_next <tgmath.h>
[2025-10-21T19:11:28.306Z]      |    |- error: module file '/var/folders/bb/hcrjxg1s0b96pfst0ymhmp240000gn/C/clang/ModuleCache/_math-6X1XIJLGY09OU392JSQVQDTP4.pcm' is out of date and needs to be rebuilt: module file has a different size than expected
[2025-10-21T19:11:28.306Z]      |    `- note: imported by module '_tgmath' in '/var/folders/bb/hcrjxg1s0b96pfst0ymhmp240000gn/C/clang/ModuleCache/_tgmath-2GYTFMG43DA744YYSLNZJ1P27.pcm'
[2025-10-21T19:11:28.306Z]   22 | #else

@jansvoboda11 I think I saw this similar error when trying to run smoke tests. Do I need to rebase my branch diff on the new main commit after this diff lands?

@vanvoorden vanvoorden mentioned this pull request Oct 21, 2025
Open
@jansvoboda11
Copy link
Contributor

jansvoboda11 commented Oct 21, 2025

@vanvoorden I think one of my PRs introduced a bug. I have reverts here: swiftlang/llvm-project#11670 #85051

@vanvoorden
Copy link
Contributor

vanvoorden commented Oct 23, 2025

@jansvoboda11 I rebased my diff yesterday in the morning on main but I still saw smoke test failures… were there any new diffs that landed that might help?

@jansvoboda11
Copy link
Contributor

jansvoboda11 commented Oct 23, 2025

Does your branch contain the reverts mentioned above? I'm not aware of other commits you'd need to fix the issue.

@vanvoorden
Copy link
Contributor

vanvoorden commented Oct 23, 2025

@jansvoboda11 Yes I rebased from yesterday which should have included the reverts. Hmm… are these smoke test jobs generally just flaky to begin with?

@qiongsiwu
Merge branch 'main' into jan_svoboda/main-sandbox-cherry-pick
3208bd7 
 Conflicts:
	lib/ClangImporter/ClangImporter.cpp
@qiongsiwu
Copy link
Contributor Author

qiongsiwu commented Oct 26, 2025

swiftlang/llvm-project#11631

@swift-ci please smoke test.

@qiongsiwu qiongsiwu merged commit 1cf8d2e into main Oct 27, 2025
3 checks passed
@qiongsiwu qiongsiwu deleted the jan_svoboda/main-sandbox-cherry-pick branch October 27, 2025 23:50
@vanvoorden
Copy link
Contributor

vanvoorden commented Oct 28, 2025

@qiongsiwu Do we think this might help fix those flaky smoke tests? Should I try rebasing my diffs on main?

speednoisemovement pushed a commit to speednoisemovement/swift that referenced this pull request Oct 29, 2025
@qiongsiwu @jansvoboda11 @speednoisemovement
[ClangImporter] Fix Build Break Due to clang API changes (swiftlang…
c71480a 
…#84925)

<!--
If this pull request is targeting a release branch, please fill out the
following form:

https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md?plain=1

Otherwise, replace this comment with a description of your changes and
rationale. Provide links to external references/discussions if
appropriate.
If this pull request resolves any GitHub issues, link them like so:

  Resolves <link to issue>, resolves <link to another issue>.

For more information about linking a pull request to an issue, see:

https://docs.github.com/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
-->

<!--
Before merging this pull request, you must run the Swift continuous
integration tests.
For information about triggering CI builds via @swift-ci, see:

https://github.com/apple/swift/blob/main/docs/ContinuousIntegration.md#swift-ci

Thank you for your contribution to Swift!
-->

swiftlang/llvm-project#11631 is cherry-picking
`clang` commits that change `CompilerInstance`'s APIs. The API changes
are causing Swift build breaks. This PR fixes the API breaks.

---------

Co-authored-by: Jan Svoboda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artemcm artemcm artemcm approved these changes

@cachemeifyoucan cachemeifyoucan cachemeifyoucan approved these changes

@zoecarver zoecarver Awaiting requested review from zoecarver

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

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

@ian-twilightcoder ian-twilightcoder Awaiting requested review from ian-twilightcoder ian-twilightcoder is a code owner

@Xazax-hun Xazax-hun Awaiting requested review from Xazax-hun Xazax-hun is a code owner

@j-hui j-hui Awaiting requested review from j-hui j-hui is a code owner

@fahadnayyar fahadnayyar Awaiting requested review from fahadnayyar

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

@Bigcheese Bigcheese Awaiting requested review from Bigcheese

@jansvoboda11 jansvoboda11 Awaiting requested review from jansvoboda11

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@qiongsiwu @nkcsgexi @artemcm @vanvoorden @jansvoboda11 @cachemeifyoucan