Merge pull request #6255 from akyrtzi/pr/stable2/fix-optional-assertion

[CAS/LazyMappedFileRegion] Fix assertion hit while using `std::optional`

Author: akyrtzi

llvm/lib/CAS/LazyMappedFileRegion.cpp

@@ -243,29 +243,30 @@ Expected<LazyMappedFileRegion> LazyMappedFileRegion::create(
   sys::fs::file_t File = sys::fs::convertFDToNativeFile(FD);
 
   struct FileLockRAII {
-    LazyMappedFileRegion &LMFR;
+    std::string Path;
+    int FD;
     bool IsLocked = false;
 
     enum LockKind { Shared, Exclusive };
 
-    FileLockRAII(LazyMappedFileRegion &LMFR) : LMFR(LMFR) {}
+    FileLockRAII(LazyMappedFileRegion &LMFR) : Path(LMFR.Path), FD(*LMFR.FD) {}
     ~FileLockRAII() { consumeError(unlock()); }
 
     Error lock(LockKind LK) {
       if (IsLocked)
         return createStringError(inconvertibleErrorCode(),
-                                 LMFR.Path + " already locked");
-      if (std::error_code EC = sys::fs::lockFile(*LMFR.FD, LK == Exclusive))
-        return createFileError(LMFR.Path, EC);
+                                 Path + " already locked");
+      if (std::error_code EC = sys::fs::lockFile(FD, LK == Exclusive))
+        return createFileError(Path, EC);
       IsLocked = true;
       return Error::success();
     }
 
     Error unlock() {
       if (IsLocked) {
         IsLocked = false;
-        if (std::error_code EC = sys::fs::unlockFile(*LMFR.FD))
-          return createFileError(LMFR.Path, EC);
+        if (std::error_code EC = sys::fs::unlockFile(FD))
+          return createFileError(Path, EC);
       }
       return Error::success();
     }