mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
f3ff561c6f
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.
56 lines
2.1 KiB
C++
56 lines
2.1 KiB
C++
//===--- Context.cpp ------------------------------------------------------===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
|
|
// Licensed under Apache License v2.0 with Runtime Library Exception
|
|
//
|
|
// See https://swift.org/LICENSE.txt for license information
|
|
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "SourceKit/Core/Context.h"
|
|
#include "SourceKit/Core/LangSupport.h"
|
|
#include "SourceKit/Core/NotificationCenter.h"
|
|
|
|
using namespace SourceKit;
|
|
|
|
GlobalConfig::Settings
|
|
GlobalConfig::update(llvm::Optional<unsigned> CompletionMaxASTContextReuseCount,
|
|
llvm::Optional<unsigned> CompletionCheckDependencyInterval) {
|
|
llvm::sys::ScopedLock L(Mtx);
|
|
if (CompletionMaxASTContextReuseCount.has_value())
|
|
State.IDEInspectionOpts.MaxASTContextReuseCount =
|
|
*CompletionMaxASTContextReuseCount;
|
|
if (CompletionCheckDependencyInterval.has_value())
|
|
State.IDEInspectionOpts.CheckDependencyInterval =
|
|
*CompletionCheckDependencyInterval;
|
|
return State;
|
|
}
|
|
|
|
GlobalConfig::Settings::IDEInspectionOptions
|
|
GlobalConfig::getIDEInspectionOpts() const {
|
|
llvm::sys::ScopedLock L(Mtx);
|
|
return State.IDEInspectionOpts;
|
|
}
|
|
|
|
SourceKit::Context::Context(
|
|
StringRef SwiftExecutablePath, StringRef RuntimeLibPath,
|
|
StringRef DiagnosticDocumentationPath,
|
|
llvm::function_ref<std::unique_ptr<LangSupport>(Context &)>
|
|
LangSupportFactoryFn,
|
|
bool shouldDispatchNotificationsOnMain)
|
|
: SwiftExecutablePath(SwiftExecutablePath), RuntimeLibPath(RuntimeLibPath),
|
|
DiagnosticDocumentationPath(DiagnosticDocumentationPath),
|
|
NotificationCtr(
|
|
new NotificationCenter(shouldDispatchNotificationsOnMain)),
|
|
Config(new GlobalConfig()), ReqTracker(new RequestTracker()),
|
|
SlowRequestSim(new SlowRequestSimulator(ReqTracker)) {
|
|
// Should be called last after everything is initialized.
|
|
SwiftLang = LangSupportFactoryFn(*this);
|
|
}
|
|
|
|
SourceKit::Context::~Context() {
|
|
}
|