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

This commit is contained in:
swift-ci
2019-10-10 13:50:08 -07:00
44 changed files with 1104 additions and 174 deletions

View File

@@ -829,7 +829,7 @@ bool SwiftLangSupport::printDisplayName(const swift::ValueDecl *D,
}
bool SwiftLangSupport::printUSR(const ValueDecl *D, llvm::raw_ostream &OS) {
return ide::printDeclUSR(D, OS);
return ide::printValueDeclUSR(D, OS);
}
bool SwiftLangSupport::printDeclTypeUSR(const ValueDecl *D, llvm::raw_ostream &OS) {