Merge pull request #75555 from cachemeifyoucan/eng/PR-132758308

[Caching] Use `swift-frontend` as executable name in replays

Author: cachemeifyoucan

lib/Frontend/DiagnosticHelper.cpp

@@ -347,6 +347,9 @@ static DetailedTaskDescription constructDetailedTaskDescription(
     ArrayRef<const char *> Args, bool isEmitModuleOnly = false) {
   // Command line and arguments
   std::string Executable = Invocation.getFrontendOptions().MainExecutablePath;
+  // If main executable path is never set, use `swift-frontend` as placeholder.
+  if (Executable.empty())
+    Executable = "swift-frontend";
   SmallVector<std::string, 16> Arguments;
   std::string CommandLine;
   SmallVector<CommandInput, 4> Inputs;

test/CAS/swift-scan-diagnostics-batch.swift

@@ -50,8 +50,6 @@
 
 // PARSEABLE-COUNT-1:   "kind": "began",
 // PARSEABLE-COUNT-1:   "kind": "finished",
-// PRASEABLE-NOT: "kind": "began",
-// PRASEABLE-NOT: "kind": "finished",
 
 // NO-OUTPUT-NOT: "kind": "began",
 

test/CAS/swift-scan-diagnostics.swift

@@ -54,6 +54,7 @@
 // PARSEABLE-NEXT: {
 // PARSEABLE-NEXT:   "kind": "began",
 // PARSEABLE-NEXT:   "name": "compile",
+// PARSEABLE-NEXT:   "command": "swift-frontend
 
 // PARSEABLE:   "kind": "finished",
 // PARSEABLE-NEXT:   "name": "compile",

tools/libSwiftScan/SwiftCaching.cpp

@@ -276,16 +276,8 @@ computeCacheKey(llvm::cas::ObjectStore &CAS, llvm::ArrayRef<const char *> Args,
   swift::CompilerInvocation Invocation;
   swift::SourceManager SourceMgr;
   swift::DiagnosticEngine Diags(SourceMgr);
-  llvm::SmallString<128> workingDirectory;
-  llvm::sys::fs::current_path(workingDirectory);
-  llvm::SmallVector<std::unique_ptr<llvm::MemoryBuffer>, 4>
-      configurationFileBuffers;
 
-  std::string MainExecutablePath = llvm::sys::fs::getMainExecutable(
-      "swift-frontend", (void *)swiftscan_cache_replay_compilation);
-
-  if (Invocation.parseArgs(Args, Diags, &configurationFileBuffers,
-                           workingDirectory, MainExecutablePath))
+  if (Invocation.parseArgs(Args, Diags, nullptr, {}))
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
                                    "Argument parsing failed");
 
@@ -826,11 +818,7 @@ swiftscan_cache_replay_instance_create(int argc, const char **argv,
   swift::DiagnosticEngine DE(SrcMgr);
   DE.addConsumer(Diags);
 
-  std::string MainExecutablePath = llvm::sys::fs::getMainExecutable(
-      "swift-frontend", (void *)swiftscan_cache_replay_compilation);
-
-  if (Instance->Invocation.parseArgs(Args, DE, nullptr, {},
-                                     MainExecutablePath)) {
+  if (Instance->Invocation.parseArgs(Args, DE, nullptr, {})) {
     delete Instance;
     *error = swift::c_string_utils::create_clone(err_msg.c_str());
     return nullptr;
@@ -981,8 +969,11 @@ static llvm::Error replayCompilation(SwiftScanReplayInstance &Instance,
     DH.initDiagConsumers(Invocation);
     DH.beginMessage(Invocation, Instance.Args);
 
-    if (auto E = CDP->replayCachedDiagnostics(DiagnosticsOutput->getData()))
+    if (auto E = CDP->replayCachedDiagnostics(DiagnosticsOutput->getData())) {
+      DH.endMessage(/*ReturnCode=*/1);
+      Inst.getDiags().finishProcessing();
       return E;
+    }
 
     if (Remarks)
       Inst.getDiags().diagnose(SourceLoc(), diag::replay_output,