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

[sourcekit] Stop storing a bare reference to LangSupport in ASTManager

Browse Source 
This fixes a use-after-free when an AST build finishes after shutdown().
This commit is contained in:
Ben Langmuir
2018-09-25 14:00:59 -07:00
parent 1015da026e
commit b3422c1e9d
6 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View File

@@ -179,7 +179,10 @@ SwiftLangSupport::SwiftLangSupport(SourceKit::Context &SKCtx)
llvm::sys::path::append(LibPath, "swift");
RuntimeResourcePath = LibPath.str();
ASTMgr = std::make_shared<SwiftASTManager>(*this);
Stats = std::make_shared<SwiftStatistics>();
EditorDocuments = std::make_shared<SwiftEditorDocumentFileMap>();
ASTMgr = std::make_shared<SwiftASTManager>(EditorDocuments, Stats,
RuntimeResourcePath);
// By default, just use the in-memory cache.
CCCache->inMemory = llvm::make_unique<ide::CodeCompletionCache>();
}
@@ -766,7 +769,7 @@ std::string SwiftLangSupport::resolvePathSymlinks(StringRef FilePath) {
void SwiftLangSupport::getStatistics(StatisticsReceiver receiver) {
std::vector<Statistic *> stats = {
#define SWIFT_STATISTIC(VAR, UID, DESC) &Stats.VAR,
#define SWIFT_STATISTIC(VAR, UID, DESC) &Stats->VAR,
#include "SwiftStatistics.def"
};
receiver(stats);