ModuleLoader: remove several walk-arounds for not having a persistent ClangImporterOptions available. NFC

This commit is contained in:
Xi Ge
2020-09-02 09:34:35 -07:00
parent 773eec1a71
commit a4d731ed9f
8 changed files with 24 additions and 49 deletions

View File

@@ -2425,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,