averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] add llvm namespace to Optional and None

Browse Source 
This is phase-1 of switching from llvm::Optional to std::optional in the
next rebranch. llvm::Optional was removed from upstream LLVM, so we need
to migrate off rather soon. On Darwin, std::optional, and llvm::Optional
have the same layout, so we don't need to be as concerned about ABI
beyond the name mangling. `llvm::Optional` is only returned from one
function in
```
getStandardTypeSubst(StringRef TypeName,
                     bool allowConcurrencyManglings);
```
It's the return value, so it should not impact the mangling of the
function, and the layout is the same as `std::optional`, so it should be
mostly okay. This function doesn't appear to have users, and the ABI was
already broken 2 years ago for concurrency and no one seemed to notice
so this should be "okay".

I'm doing the migration incrementally so that folks working on main can
cherry-pick back to the release/5.9 branch. Once 5.9 is done and locked
away, then we can go through and finish the replacement. Since `None`
and `Optional` show up in contexts where they are not `llvm::None` and
`llvm::Optional`, I'm preparing the work now by going through and
removing the namespace unwrapping and making the `llvm` namespace
explicit. This should make it fairly mechanical to go through and
replace llvm::Optional with std::optional, and llvm::None with
std::nullopt. It's also a change that can be brought onto the
release/5.9 with minimal impact. This should be an NFC change.
This commit is contained in:
Evan Wilde
2023-06-15 11:20:33 -07:00
parent 50d2f4d3ed
commit f3ff561c6f
684 changed files with 5846 additions and 5798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/swift/Serialization/SerializedModuleLoader.h
View File

@@ -180,7 +180,7 @@ public:
/// If the AST cannot be loaded and \p diagLoc is present, a diagnostic is
/// printed. (Note that \p diagLoc is allowed to be invalid.)
LoadedFile *
loadAST(ModuleDecl &M, Optional<SourceLoc> diagLoc,
loadAST(ModuleDecl &M, llvm::Optional<SourceLoc> diagLoc,
StringRef moduleInterfacePath, StringRef moduleInterfaceSourcePath,
std::unique_ptr<llvm::MemoryBuffer> moduleInputBuffer,
std::unique_ptr<llvm::MemoryBuffer> moduleDocInputBuffer,
@@ -232,7 +232,7 @@ public:
virtual void verifyAllModules() override;
virtual Optional<const ModuleDependencyInfo*> getModuleDependencies(
virtual llvm::Optional<const ModuleDependencyInfo*> getModuleDependencies(
StringRef moduleName, ModuleDependenciesCache &cache,
InterfaceSubContextDelegate &delegate,
bool isTestableImport) override;
@@ -425,7 +425,7 @@ public:
ObjCSelector selector,
SmallVectorImpl<AbstractFunctionDecl *> &results) const override;
Optional<Fingerprint>
llvm::Optional<Fingerprint>
loadFingerprint(const IterableDeclContext *IDC) const override;
virtual void
@@ -433,20 +433,20 @@ public:
const ModuleDecl *importedModule,
llvm::SmallSetVector<Identifier, 4> &spiGroups) const override;
Optional<CommentInfo> getCommentForDecl(const Decl *D) const override;
llvm::Optional<CommentInfo> getCommentForDecl(const Decl *D) const override;
bool hasLoadedSwiftDoc() const override;
Optional<StringRef> getGroupNameForDecl(const Decl *D) const override;
llvm::Optional<StringRef> getGroupNameForDecl(const Decl *D) const override;
Optional<StringRef> getSourceFileNameForDecl(const Decl *D) const override;
llvm::Optional<StringRef> getSourceFileNameForDecl(const Decl *D) const override;
Optional<unsigned> getSourceOrderForDecl(const Decl *D) const override;
llvm::Optional<unsigned> getSourceOrderForDecl(const Decl *D) const override;
Optional<StringRef> getGroupNameByUSR(StringRef USR) const override;
llvm::Optional<StringRef> getGroupNameByUSR(StringRef USR) const override;
Optional<ExternalSourceLocs::RawLocs>
llvm::Optional<ExternalSourceLocs::RawLocs>
getExternalRawLocsForDecl(const Decl *D) const override;
void collectAllGroups(SmallVectorImpl<StringRef> &Names) const override;