From cd6c1aa441f8c39187fcd1f4a00a9236854ffef7 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Thu, 6 Apr 2023 21:30:53 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"=F0=9F=8D=92=20Update=20for?= =?UTF-8?q?=20clang=20dependency=20scanning=20API=20change""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 96c0ac4d9dd0367184c6cc7e50085f8bf1c79d09. --- lib/ClangImporter/ClangModuleDependencyScanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ClangImporter/ClangModuleDependencyScanner.cpp b/lib/ClangImporter/ClangModuleDependencyScanner.cpp index c05dbbdaba69d..42e77d62cda00 100644 --- a/lib/ClangImporter/ClangModuleDependencyScanner.cpp +++ b/lib/ClangImporter/ClangModuleDependencyScanner.cpp @@ -238,7 +238,7 @@ Optional ClangImporter::getModuleDependencies( auto clangModuleDependencies = cache.getClangScannerTool().getModuleDependencies( moduleName, commandLineArgs, workingDir, - cache.getAlreadySeenClangModules(), lookupModuleOutput, {}); + cache.getAlreadySeenClangModules(), lookupModuleOutput); if (!clangModuleDependencies) { auto errorStr = toString(clangModuleDependencies.takeError()); // We ignore the "module 'foo' not found" error, the Swift dependency @@ -298,7 +298,7 @@ bool ClangImporter::addBridgingHeaderDependencies( auto clangModuleDependencies = cache.getClangScannerTool().getTranslationUnitDependencies( commandLineArgs, workingDir, cache.getAlreadySeenClangModules(), - lookupModuleOutput, {}); + lookupModuleOutput); if (!clangModuleDependencies) { // FIXME: Route this to a normal diagnostic. llvm::logAllUnhandledErrors(clangModuleDependencies.takeError(), llvm::errs());