Fix single-module shim macro handling - #128
Open
fallintoplace wants to merge 1 commit into
Open
Conversation
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
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.
Summary
ATOMICS_SINGLE_MODULEandSWIFTATOMIC_SINGLE_MODULEat the top of_AtomicsShims.hbefore either macro is used.ATOMICS_SINGLE_MODULEfor the single-module_sa_retain_nand_sa_release_ndeclarations, matching the Xcode and Swift configuration name.Atomics.xcodeprojscheme.Why
Xcode defines
ATOMICS_SINGLE_MODULE, and Swift checksATOMICS_SINGLE_MODULE, but_AtomicsShims.hcheckedSWIFTATOMIC_SINGLE_MODULEfor the calling-convention branch. That means the intended single-module declaration path could be skipped even though the rest of the Xcode build was in single-module mode.Notes
The smoke step uses
Xcode/Atomics.xcodeproj, since that is the project configuration that definesATOMICS_SINGLE_MODULEthroughXcode/Shared.xcconfig.