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

Merge pull request #83204 from swiftlang/jepa-main

Browse Source 
Address rebranch deprecations
This commit is contained in:
Anthony Latsis
2025-07-23 06:00:57 +01:00
committed by GitHub
parent 5664fd6186 ed1d70fb3b
commit c7b51edf0a
57 changed files with 568 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/CASOutputBackends.cpp
View File

@@ -78,11 +78,11 @@ public:
(void)Shortened;
std::optional<ObjectRef> PathRef;
if (Error E =
CAS.storeFromString(std::nullopt, Path).moveInto(PathRef))
CAS.storeFromString(/*Refs*/ {}, Path).moveInto(PathRef))
return E;
std::optional<ObjectRef> BytesRef;
if (Error E =
CAS.storeFromString(std::nullopt, Bytes).moveInto(BytesRef))
CAS.storeFromString(/*Refs*/ {}, Bytes).moveInto(BytesRef))
return E;
auto Ref = CAS.store({*PathRef, *BytesRef}, {});
if (!Ref)
@@ -256,7 +256,7 @@ Error SwiftCASOutputBackend::Implementation::storeImpl(
StringRef Path, StringRef Bytes, unsigned InputIndex,
file_types::ID OutputKind) {
std::optional<ObjectRef> BytesRef;
if (Error E = CAS.storeFromString(std::nullopt, Bytes).moveInto(BytesRef))
if (Error E = CAS.storeFromString(/*Refs*/ {}, Bytes).moveInto(BytesRef))
return E;
LLVM_DEBUG(llvm::dbgs() << "DEBUG: producing CAS output of type \'"

4
lib/Frontend/CompileJobCacheKey.cpp
View File

@@ -72,14 +72,14 @@ llvm::Expected<llvm::cas::ObjectRef> swift::createCompileJobBaseCacheKey(
}
llvm::cas::HierarchicalTreeBuilder Builder;
auto CMD = CAS.storeFromString(std::nullopt, CommandLine);
auto CMD = CAS.storeFromString(/*Refs*/ {}, CommandLine);
if (!CMD)
return CMD.takeError();
Builder.push(*CMD, llvm::cas::TreeEntry::Regular, "command-line");
// FIXME: The version is maybe insufficient...
auto Version =
CAS.storeFromString(std::nullopt, version::getSwiftFullVersion());
CAS.storeFromString(/*Refs*/ {}, version::getSwiftFullVersion());
if (!Version)
return Version.takeError();
Builder.push(*Version, llvm::cas::TreeEntry::Regular, "version");