Merge remote-tracking branch 'main' into 'rebranch'

This commit is contained in:
Evan Wilde
2023-10-16 23:00:12 -07:00
93 changed files with 2109 additions and 766 deletions

View File

@@ -30,6 +30,7 @@
#include "swift/Basic/LangOptions.h"
#include "swift/Basic/SourceManager.h"
#include "swift/ClangImporter/ClangImporter.h"
#include "swift/Frontend/CASOutputBackends.h"
#include "swift/Frontend/CachedDiagnostics.h"
#include "swift/Frontend/DiagnosticVerifier.h"
#include "swift/Frontend/FrontendOptions.h"
@@ -487,6 +488,10 @@ class CompilerInstance {
/// Virtual OutputBackend.
llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutputBackend = nullptr;
/// CAS OutputBackend.
llvm::IntrusiveRefCntPtr<swift::cas::SwiftCASOutputBackend> CASOutputBackend =
nullptr;
/// The verification output backend.
using HashBackendTy = llvm::vfs::HashingOutputBackend<llvm::BLAKE3>;
llvm::IntrusiveRefCntPtr<HashBackendTy> HashBackend;
@@ -541,6 +546,10 @@ public:
llvm::vfs::OutputBackend &getOutputBackend() const {
return *OutputBackend;
}
swift::cas::SwiftCASOutputBackend &getCASOutputBackend() const {
return *CASOutputBackend;
}
void
setOutputBackend(llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> Backend) {
OutputBackend = std::move(Backend);