[#bundle support] Generate internal bundle access class for mergeable libraries #599
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
matthewseaman
requested review from
aciidgh,
jakepetroules,
mhrawdon,
mirza-garibovic,
neonichu and
owenv
as code owners
dmcyk
reviewed
Jun 20, 2025
There was a problem hiding this comment.
I wonder if this effectively evaluates to true in a debug build when we're not building as mergeable? cc @mhrawdon
There was a problem hiding this comment.
I think this is the difference between MERGEABLE_LIBRARY and MAKE_MERGEABLE.
If MERGEABLE_LIBRARY is true then this is a library that is opting into being mergeable (either automatically or manually), while MAKE_MERGEABLE is only true in optimized builds per the lines above.
So MERGEABLE_LIBRARY should be what we need here.
|
@swift-ci test |
matthewseaman
force-pushed
the
mseaman/mergeable-library-bundle-macro-support
branch
from
c9813f4 to
157001d
Compare
|
@swift-ci test |
owenv
approved these changes
Jun 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Mergeable libraries use a re-exported library in Debug mode and merge into the client in Release builds.
In both cases, we cannot simply rely on the
#dsohandlefor bundle lookup as#bundledoes by default.Instead,
dyldincludes special bundle loading hooks that allowsBundleForClassto return the current resource bundle at runtime.In this PR, we have mergeable libraries codegen a simple
__BundleLookupHelperclass and define theSWIFT_BUNDLE_LOOKUP_HELPER_AVAILABLEcompilation condition.The implementation of
#bundlein Foundation will then lookupBundle(for: __BundleLookupHelper.self)under this condition.This solution intentional avoids the need for generated code to
import Foundation.This should allow
#bundleto work correctly for mergeable libraries.