Skip to content

Recommit: [cxx-interop] start to emitting a unified header file for a Swift module #41912

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.

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

Merged
merged 2 commits into from
Mar 21, 2022

Conversation

hyp
Copy link
Contributor

@hyp hyp commented Mar 19, 2022

No description provided.

@hyp
Copy link
Contributor Author

hyp commented Mar 19, 2022

@swift-ci Please smoke benchmark

@hyp
Copy link
Contributor Author

hyp commented Mar 19, 2022

@swift-ci Please benchmark

…ublic-decl' is enabled

This fix also ensures that we only emit C++ functions for now
@hyp
Copy link
Contributor Author

hyp commented Mar 21, 2022

@swift-ci please test

@hyp
Copy link
Contributor Author

hyp commented Mar 21, 2022

@swift-ci please benchmark

@hyp hyp merged commit a6a330c into swiftlang:main Mar 21, 2022
@@ -59,8 +59,7 @@ TYPE("raw-sib", RawSIB, "sib", "")
TYPE("llvm-ir", LLVM_IR, "ll", "")
TYPE("llvm-bc", LLVM_BC, "bc", "")
TYPE("diagnostics", SerializedDiagnostics, "dia", "")
TYPE("objc-header", ObjCHeader, "h", "")
TYPE("cxx-header", CXXHeader, "h", "")
TYPE("clang-header", ClangHeader, "h", "")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name objc-header is significant in the output file map. I like the idea of changing this to clang-header, but we still have to properly consume output file maps where the key is 'objc-header'. This change is causing failures in the source compatibility suite, because the generated headers aren't being produced at all. See, e.g., https://ci.swift.org/job/swift-PR-source-compat-suite-macos/107/artifact/swift-source-compat-suite/FAIL_Starscream-examples-AutobahnTest-Autobahn.xcodeproj_5.0_BuildXcodeProjectScheme_Starscream_generic-platform-iOS.log

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thank you for pointing that out

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix in #42061

hyp added a commit to hyp/swift that referenced this pull request Mar 28, 2022
This reverts commit a6a330c, reversing
changes made to a45940c.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants