Fix cocoapods data race - #1070
Merged
Merged
Conversation
ekharkunov
self-requested a review
September 24, 2026 12:04
generateHeaderMap() pointed public header entries at "<moduleName>/<filename>" instead of the header's real directory. That only resolves when a directory literally named after the module exists relative to clang's working directory, which is true for CocoaPods' own Headers/Public symlink layout but not for headers vendored inside an .xcframework (e.g. IronSourceAdQualitySDK). Since clang treats a header map as an authoritative lookup table, a wrong entry there causes the compiler to stop searching once it matches the filename instead of falling through to the correct -I directory later in the search path, producing a "file not found" error even though the header exists on disk. Also adds validateHeaderMapEntries(), which warns when a generated header map entry doesn't resolve to a real file, to surface this failure mode immediately instead of requiring fs_usage-level tracing to diagnose it.
- Restore ReentrantReadWriteLock: non-isolated install, repo update/add-cdn, rotation, cleanup and merge-back take the write lock; cloning the shared cache for an isolated install takes the read lock so clones run concurrently - Snapshot the shared cache dir under the lock before cloning, skip merge-back if the cache was rotated during install, and don't fail the build on a merge-back error - Replace 'cp -R -c' with FileCloneUtil.cloneTree (Files.copy with COPY_ATTRIBUTES uses clonefile(2) on macOS with JDK 21+); merge-back only adds new files and never overwrites the shared cache - Enable isolated-install by default
ekharkunov
approved these changes
Sep 28, 2026
Contributor
|
@zotrix Thanks for contribution! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Trying to fix #989
isolated-install copy pods to isolated dir before use.
merge-back merge changes back to home, to allow reuse later