Manually merge remote-tracking branch 'upstream/master' into manually-merge-master-to-master-rebranch

This commit is contained in:
Nathan Hawes
2020-07-20 16:09:55 -07:00
728 changed files with 39487 additions and 15960 deletions

View File

@@ -915,12 +915,10 @@ void SwiftLangSupport::printMemberDeclDescription(const swift::ValueDecl *VD,
}
OS << ')';
};
if (auto EED = dyn_cast<EnumElementDecl>(VD)) {
if (auto params = EED->getParameterList())
printParams(params);
} else if (auto *FD = dyn_cast<FuncDecl>(VD)) {
if (auto params = FD->getParameters())
printParams(params);
if (isa<EnumElementDecl>(VD) || isa<FuncDecl>(VD)) {
if (const auto ParamList = getParameterList(const_cast<ValueDecl *>(VD))) {
printParams(ParamList);
}
} else if (isa<VarDecl>(VD)) {
// Var decl doesn't have parameters.
} else {