Merge pull request #7326 from akyrtzi/akyrtzi/pr/stable-fix-ubsan

akyrtzi · web-flow · commit 1503a15ff598 · 2023-08-25T18:14:14.000-07:00
[clang/CompileJobCache] Fix UBSan issue
diff --git a/clang/lib/Frontend/CompileJobCache.cpp b/clang/lib/Frontend/CompileJobCache.cpp
@@ -78,7 +78,8 @@ class ObjectStoreCachingOutputs : public CompileJobCache::CachingOutputs {
                             std::shared_ptr<llvm::cas::ActionCache> Cache)
       : CachingOutputs(Clang, std::move(Mapper)), CAS(std::move(DB)),
         Cache(std::move(Cache)) {
-    CASOutputs = llvm::makeIntrusiveRefCnt<llvm::cas::CASOutputBackend>(*CAS);
+    if (CAS)
+      CASOutputs = llvm::makeIntrusiveRefCnt<llvm::cas::CASOutputBackend>(*CAS);
   }
 
   Expected<std::optional<int>>

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ class ObjectStoreCachingOutputs : public CompileJobCache::CachingOutputs {`
`78`	`78`	`std::shared_ptr<llvm::cas::ActionCache> Cache)`
`79`	`79`	`: CachingOutputs(Clang, std::move(Mapper)), CAS(std::move(DB)),`
`80`	`80`	`Cache(std::move(Cache)) {`
`81`		`- CASOutputs = llvm::makeIntrusiveRefCnt<llvm::cas::CASOutputBackend>(*CAS);`
	`81`	`+ if (CAS)`
	`82`	`+ CASOutputs = llvm::makeIntrusiveRefCnt<llvm::cas::CASOutputBackend>(*CAS);`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`Expected<std::optional<int>>`