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 'apple/master' into master-rebranch

Browse Source
This commit is contained in:
Xi Ge
2020-09-02 18:36:37 -07:00
parent ac6dffdf41 ed5edb89f5
commit e107182f1a
74 changed files with 1040 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -2355,8 +2355,7 @@ static bool readBreakageAllowlist(SDKContext &Ctx, llvm::StringSet<> &lines) {
invok.setModuleName("ForClangImporter");
if (instance.setup(invok))
return 1;
ClangImporterOptions impOpts;
auto importer = ClangImporter::create(instance.getASTContext(), impOpts);
auto importer = ClangImporter::create(instance.getASTContext());
SmallString<128> preprocessedFilePath;
if (auto error = llvm::sys::fs::createTemporaryFile(
"breakage-allowlist-", "txt", preprocessedFilePath)) {
@@ -2426,9 +2425,8 @@ static int diagnoseModuleChange(StringRef LeftPath, StringRef RightPath,
LeftCollector.deSerialize(LeftPath);
SwiftDeclCollector RightCollector(Ctx);
RightCollector.deSerialize(RightPath);
diagnoseModuleChange(Ctx, LeftCollector.getSDKRoot(), RightCollector.getSDKRoot(),
OutputPath, std::move(ProtocolReqAllowlist));
return options::CompilerStyleDiags && Ctx.getDiags().hadAnyError() ? 1 : 0;
return diagnoseModuleChange(Ctx, LeftCollector.getSDKRoot(),
RightCollector.getSDKRoot(), OutputPath, std::move(ProtocolReqAllowlist));
}
static void populateAliasChanges(NodeMap &AliasMap, DiffVector &AllItems,