[llvm] [CaptureTracking] Compute results with and without return capture (PR #195857)

[Nikita Popov via llvm-commits]

================
@@ -234,13 +236,13 @@ EarliestEscapeAnalysis::getCapturesBefore(const Value *Object,
 
   auto Iter = EarliestEscapes.try_emplace(Object);
   if (Iter.second) {
-    std::pair<Instruction *, CaptureComponents> EarliestCapture =
-        FindEarliestCapture(Object, *DT.getRoot()->getParent(),
-                            /*ReturnCaptures=*/false, DT,
+    std::pair<Instruction *, CaptureResult> EarliestCapture =
+        FindEarliestCapture(Object, *DT.getRoot()->getParent(), DT,
                             CaptureComponents::Provenance);
     if (EarliestCapture.first)
       Inst2Obj[EarliestCapture.first].push_back(Object);
-    Iter.first->second = EarliestCapture;
+    Iter.first->second = {EarliestCapture.first,
+                          EarliestCapture.second.WithoutRet};
----------------
nikic wrote:

Ah, I see. I don't think this is necessary. We already have the bool-returning PointerMayBeCaptured() convenience API that hides away all the more complicated stuff, I don't think we need another intermediate helper API.

https://github.com/llvm/llvm-project/pull/195857