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

This commit is contained in:
swift_jenkins
2020-04-22 15:57:30 -07:00
88 changed files with 972 additions and 402 deletions

View File

@@ -2974,9 +2974,9 @@ bool SerializedASTFile::getAllGenericSignatures(
return true;
}
ClassDecl *SerializedASTFile::getMainClass() const {
Decl *SerializedASTFile::getMainDecl() const {
assert(hasEntryPoint());
return cast_or_null<ClassDecl>(File.getDecl(File.Bits.EntryPointDeclID));
return File.getDecl(File.Bits.EntryPointDeclID);
}
const version::Version &SerializedASTFile::getLanguageVersionBuiltWith() const {