mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
1525f6b982
#58786 (rdar://93030932) was failing because the `swift-frontend` invocations passed a `swiftExecutablePath` to `Invocation.parseArgs`. This caused the `ClangImporter` instance to point to a `clang` binary next to the `swift-frontend` executable while SourceKit used PATH to find `clang`. The clang executable next to `swift-frontend` doesn’t actually exist because `clang` lives in `llvm-linux-aarch64/bin` and `swift-frontend` lives in `swift-linux-aarch64/bin`. So some checks for a minimum clang verison failed for the normal build (because the executable doesn’t actually exists) while they pass during the SourceKit build (which used `clang` from `PATH`). This in turn caused the `outline-atomics` to be enabled to the SourceKit clang compiler arguments but not the clang compiler arguments for a normal build and thus resulted in two separate module cache directories (which includes the enabled features in the module directory hash). To fix this issue, also set the swift executable path for compiler invocations created from SourceKit. Fixes #58786 (rdar://93030932)
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(Optional<unsigned> CompletionMaxASTContextReuseCount,
|
|
Optional<unsigned> CompletionCheckDependencyInterval) {
|
|
llvm::sys::ScopedLock L(Mtx);
|
|
if (CompletionMaxASTContextReuseCount.hasValue())
|
|
State.CompletionOpts.MaxASTContextReuseCount =
|
|
*CompletionMaxASTContextReuseCount;
|
|
if (CompletionCheckDependencyInterval.hasValue())
|
|
State.CompletionOpts.CheckDependencyInterval =
|
|
*CompletionCheckDependencyInterval;
|
|
return State;
|
|
}
|
|
|
|
GlobalConfig::Settings::CompletionOptions
|
|
GlobalConfig::getCompletionOpts() const {
|
|
llvm::sys::ScopedLock L(Mtx);
|
|
return State.CompletionOpts;
|
|
}
|
|
|
|
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() {
|
|
}
|