Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift_jenkins
2019-12-19 14:40:17 -08:00
33 changed files with 1112 additions and 521 deletions

View File

@@ -58,7 +58,7 @@ class ImportDepth {
public:
ImportDepth() = default;
ImportDepth(ASTContext &context, CompilerInvocation &invocation);
ImportDepth(ASTContext &context, const CompilerInvocation &invocation);
Optional<uint8_t> lookup(StringRef module) {
auto I = depths.find(module);
@@ -320,7 +320,8 @@ CodeCompletionViewRef CodeCompletionOrganizer::takeResultsView() {
// ImportDepth
//===----------------------------------------------------------------------===//
ImportDepth::ImportDepth(ASTContext &context, CompilerInvocation &invocation) {
ImportDepth::ImportDepth(ASTContext &context,
const CompilerInvocation &invocation) {
llvm::DenseSet<ModuleDecl *> seen;
std::deque<std::pair<ModuleDecl *, uint8_t>> worklist;