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

This commit is contained in:
swift-ci
2019-09-13 20:49:32 -07:00
222 changed files with 880 additions and 809 deletions

View File

@@ -1513,7 +1513,7 @@ ModuleFile::ModuleFile(
SearchPaths.push_back({blobData, isFramework, isSystem});
break;
}
case input_block::PARSEABLE_INTERFACE_PATH: {
case input_block::MODULE_INTERFACE_PATH: {
ModuleInterfacePath = blobData;
break;
}