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

This commit is contained in:
Arnold Schwaighofer
2019-08-26 13:30:41 -07:00
57 changed files with 705 additions and 502 deletions

View File

@@ -38,6 +38,9 @@ using namespace swift::serialization;
using namespace llvm::support;
using llvm::Expected;
static_assert(IsTriviallyDestructible<SerializedASTFile>::value,
"SerializedASTFiles are BumpPtrAllocated; d'tors are not called");
static bool checkModuleSignature(llvm::BitstreamCursor &cursor,
ArrayRef<unsigned char> signature) {
for (unsigned char byte : signature) {
@@ -1526,8 +1529,7 @@ ModuleFile::ModuleFile(
break;
}
case input_block::PARSEABLE_INTERFACE_PATH: {
if (extInfo)
extInfo->setParseableInterface(blobData);
ModuleInterfacePath = blobData;
break;
}
default: