[APINotes] For a re-exported module, look for APINotes in the re-exporting module's apinotes file #8063
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
egorzhdan
requested review from
compnerd,
hyp,
DougGregor and
ian-twilightcoder
DougGregor
approved these changes
Jan 26, 2024
| // If module FooCore is re-exported through module Foo, try Foo.apinotes. | ||
| if (!ExportedModuleName.empty()) | ||
| if (auto File = findAPINotesFile(Dir, ExportedModuleName, | ||
| /*WantPublic=*/true)) { |
There was a problem hiding this comment.
Why are we forcing public? Private modules can export_as too.
There was a problem hiding this comment.
Ah, wasn't aware of that, fixed
compnerd
approved these changes
Jan 26, 2024
…rting module's apinotes file If module FooCore is re-exported through module Foo (by using `export_as` in the modulemap), look for attributes of FooCore symbols in Foo.apinotes file. Swift bundles `std.apinotes` file that adds Swift-specific attributes to the C++ stdlib symbols. In recent versions of libc++, module std got split into multiple top-level modules, each of them is re-exported through std. This change allows us to keep using a single modulemap file for all supported C++ stdlibs. rdar://121680760
egorzhdan
force-pushed
the
egorzhdan/apinotes-export-as
branch
from
00437c2 to
5084e0e
Compare
|
@compnerd we don't have enough APINotes logic upstreamed to run any tests yet, so I wanted to submit a complete PR with tests here first |
ian-twilightcoder
approved these changes
Jan 26, 2024
| @@ -233,6 +234,10 @@ APINotesManager::getCurrentModuleAPINotes(Module *M, bool LookInModule, | |||
|
|
|||
| APINotes.push_back(*File); | |||
| } | |||
| // If module FooCore is re-exported through module Foo, try Foo.apinotes. | |||
| if (!ExportedModuleName.empty()) | |||
| if (auto File = findAPINotesFile(Dir, ExportedModuleName, WantPublic)) | |||
There was a problem hiding this comment.
I wonder what happens when the public module of a framework wants to be exported as the private module of a different framework...
There was a problem hiding this comment.
🤔 Yeah, would probably be good to have a diagnostic to reject that...
egorzhdan
added a commit
to egorzhdan/llvm-project
that referenced
this pull request
Mar 27, 2024
…rting module's apinotes file This upstreams swiftlang#8063. If module FooCore is re-exported through module Foo (by using `export_as` in the modulemap), look for attributes of FooCore symbols in Foo.apinotes file. Swift bundles `std.apinotes` file that adds Swift-specific attributes to the C++ stdlib symbols. In recent versions of libc++, module std got split into multiple top-level modules, each of them is re-exported through std. This change allows us to keep using a single modulemap file for all supported C++ stdlibs. rdar://121680760
egorzhdan
added a commit
to llvm/llvm-project
that referenced
this pull request
Mar 28, 2024
…rting module's apinotes file This upstreams swiftlang#8063. If module FooCore is re-exported through module Foo (by using `export_as` in the modulemap), look for attributes of FooCore symbols in Foo.apinotes file. Swift bundles `std.apinotes` file that adds Swift-specific attributes to the C++ stdlib symbols. In recent versions of libc++, module std got split into multiple top-level modules, each of them is re-exported through std. This change allows us to keep using a single modulemap file for all supported C++ stdlibs. rdar://121680760
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.
If module FooCore is re-exported through module Foo (by using
export_asin the modulemap), look for attributes of FooCore symbols in Foo.apinotes file.Swift bundles
std.apinotesfile that adds Swift-specific attributes to the C++ stdlib symbols. In recent versions of libc++, module std got split into multiple top-level modules, each of them is re-exported through std. This change allows us to keep using a single modulemap file for all supported C++ stdlibs.rdar://121680760