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

This commit is contained in:
swift-ci
2019-10-11 15:10:04 -07:00
27 changed files with 204 additions and 223 deletions

View File

@@ -874,9 +874,9 @@ void SwiftLangSupport::printMemberDeclDescription(const swift::ValueDecl *VD,
OS << "<#T##";
paramTy = paramTy.subst(substMap);
if (paramTy->hasError() && param->getTypeLoc().hasLocation()) {
if (paramTy->hasError() && param->getTypeRepr()) {
// Fallback to 'TypeRepr' printing.
param->getTypeLoc().getTypeRepr()->print(OS);
param->getTypeRepr()->print(OS);
} else {
paramTy.print(OS);
}