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

[Caching] Fix cache replay logics for makefile dependency file

Browse Source 
Make sure the driver replay logics from C API can replay makefile
dependency file correctly.

rdar://141567785
This commit is contained in:
Steven Wu
2024-12-18 14:16:58 -08:00
parent 4f7ffcc99a
commit 58d71379aa
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Tooling/libSwiftScan/SwiftCaching.cpp
View File

@@ -28,6 +28,7 @@
#include "swift/Frontend/CompileJobCacheResult.h"
#include "swift/Frontend/DiagnosticHelper.h"
#include "swift/Frontend/Frontend.h"
#include "swift/Frontend/MakeStyleDependencies.h"
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/Option/Options.h"
#include "clang/CAS/CASOptions.h"
@@ -938,6 +939,7 @@ static llvm::Error replayCompilation(SwiftScanReplayInstance &Instance,
struct OutputEntry {
std::string Path;
llvm::cas::ObjectProxy Proxy;
file_types::ID Kind;
};
SmallVector<OutputEntry> OutputProxies;
std::optional<llvm::cas::ObjectProxy> DiagnosticsOutput;
@@ -964,7 +966,7 @@ static llvm::Error replayCompilation(SwiftScanReplayInstance &Instance,
DiagnosticsOutput = std::move(*Proxy);
} else
OutputProxies.emplace_back(
OutputEntry{OutputPath->second, std::move(*Proxy)});
OutputEntry{OutputPath->second, std::move(*Proxy), Kind});
return Error::success();
}))
return Err;
@@ -1011,6 +1013,13 @@ static llvm::Error replayCompilation(SwiftScanReplayInstance &Instance,
if (auto E = Schema->serializeObjectFile(Output.Proxy, *File))
Inst.getDiags().diagnose(SourceLoc(), diag::error_mccas,
toString(std::move(E)));
} else if (Output.Kind == file_types::ID::TY_Dependencies) {
if (emitMakeDependenciesFromSerializedBuffer(
Output.Proxy.getData(), *File,
Inst.getInvocation().getFrontendOptions(), Input,
Inst.getDiags()))
Inst.getDiags().diagnose(SourceLoc(), diag::cache_replay_failed,
"failed to emit dependency file");
} else
*File << Output.Proxy.getData();
if (auto E = File->keep())