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

This commit is contained in:
swift-ci
2019-08-22 16:29:14 -07:00
53 changed files with 205 additions and 219 deletions

View File

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