averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
swift-ci
2018-11-09 07:29:33 -08:00
parent a35d768c55 c83f63855b
commit 19e6dc8f9e
36 changed files with 614 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -304,6 +304,8 @@ FileUnit *SerializedModuleLoaderBase::loadAST(
M.addFile(*fileUnit);
if (extendedInfo.isTestable())
M.setTestingEnabled();
if (extendedInfo.arePrivateImportsEnabled())
M.setPrivateImportsEnabled();
auto diagLocOrInvalid = diagLoc.getValueOr(SourceLoc());
loadInfo.status =