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

8
tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View File

@@ -191,7 +191,7 @@ deliverCodeCompleteResults(SourceKit::CodeCompletionConsumer &SKConsumer,
void SwiftLangSupport::codeComplete(
llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
OptionsDictionary *options, SourceKit::CodeCompletionConsumer &SKConsumer,
ArrayRef<const char *> Args, Optional<VFSOptions> vfsOptions,
ArrayRef<const char *> Args, llvm::Optional<VFSOptions> vfsOptions,
SourceKitCancellationToken CancellationToken) {
CodeCompletion::Options CCOpts;
@@ -206,7 +206,7 @@ void SwiftLangSupport::codeComplete(
std::string error;
// FIXME: the use of None as primary file is to match the fact we do not read
// the document contents using the editor documents infrastructure.
auto fileSystem = getFileSystem(vfsOptions, /*primaryFile=*/None, error);
auto fileSystem = getFileSystem(vfsOptions, /*primaryFile=*/llvm::None, error);
if (!fileSystem) {
return SKConsumer.failed(error);
}
@@ -1095,7 +1095,7 @@ void SwiftLangSupport::codeCompleteOpen(
StringRef name, llvm::MemoryBuffer *inputBuf, unsigned offset,
OptionsDictionary *options, ArrayRef<FilterRule> rawFilterRules,
GroupedCodeCompletionConsumer &consumer, ArrayRef<const char *> args,
Optional<VFSOptions> vfsOptions,
llvm::Optional<VFSOptions> vfsOptions,
SourceKitCancellationToken CancellationToken) {
StringRef filterText;
unsigned resultOffset = 0;
@@ -1111,7 +1111,7 @@ void SwiftLangSupport::codeCompleteOpen(
// FIXME: the use of None as primary file is to match the fact we do not read
// the document contents using the editor documents infrastructure.
auto fileSystem =
getFileSystem(vfsOptions, /*primaryFile=*/None, fileSystemError);
getFileSystem(vfsOptions, /*primaryFile=*/llvm::None, fileSystemError);
if (!fileSystem)
return consumer.failed(fileSystemError);