[libswift] Undefine IBAction/IBOutlet ObjC macros when building lib swift #39866
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
|
@swift-ci please test |
guitard0g
changed the title
zoecarver
reviewed
Oct 26, 2021
include/swift/SIL/SILBridging.h
Outdated
| @@ -13,6 +13,16 @@ | |||
| #ifndef SWIFT_SIL_SILBRIDGING_H | |||
| #define SWIFT_SIL_SILBRIDGING_H | |||
|
|
|||
| // Stop these macros from being expanded in this | |||
| // file when compiling in ObjC++ mode. This is | |||
| // necessary for compiling libswift with c++-interop. | |||
There was a problem hiding this comment.
This is so we don't have to change the LLVM headers? Makes sense, but if we put them here we can also remove the Attr.def change, right?
There was a problem hiding this comment.
Unfortunately we seem to need this in addition to both the Attr.def change and the changes in the LLVM headers, though I'm not entirely sure why undefining it here doesn't fix those problems (might be something to do with modules...).
There was a problem hiding this comment.
If you put this change into include/swift/SIL/BridgedSwiftObject.h then you don't need to update the LLVM header or the other Swift header.
guitard0g
force-pushed
the
temp_undef_ib_macros
branch
from
e560741 to
40da89c
Compare
|
@swift-ci please test |
guitard0g
changed the title
|
@swift-ci please test Windows |
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.
When we compile libswift with c++-interop enabled, it actually ends up compiling the project as objc++ on Darwin platforms because objc interop is necessarily enabled by default. This causes problems in the libswift bridging header because we try to expand the ObjC IBAction/IBOutlet/IBInspectable macros in inappropriate places.
This change fixes the problem by undefining these macros via
-Uflags passed when building libswift.