<div dir="ltr">Maybe TraceExpander should use std::function instead?</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Sep 11, 2018 at 1:04 AM Dean Michael Berris via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dberris<br>
Date: Tue Sep 11 01:03:30 2018<br>
New Revision: 341912<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=341912&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=341912&view=rev</a><br>
Log:<br>
[XRay] Ensure lambda outlives llvm::function_ref<br>
<br>
Follow-up to D51912.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/XRay/FDRTraceExpander.h<br>
    llvm/trunk/lib/XRay/Trace.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/XRay/FDRTraceExpander.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/XRay/FDRTraceExpander.h?rev=341912&r1=341911&r2=341912&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/XRay/FDRTraceExpander.h?rev=341912&r1=341911&r2=341912&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/XRay/FDRTraceExpander.h (original)<br>
+++ llvm/trunk/include/llvm/XRay/FDRTraceExpander.h Tue Sep 11 01:03:30 2018<br>
@@ -27,7 +27,7 @@ class TraceExpander : public RecordVisit<br>
   int32_t PID = 0;<br>
   int32_t TID = 0;<br>
   uint64_t BaseTSC = 0;<br>
-  XRayRecord CurrentRecord{};<br>
+  XRayRecord CurrentRecord{0, 0, RecordTypes::ENTER, 0, 0, 0, 0, {}};<br>
   uint16_t CPUId = 0;<br>
   uint16_t LogVersion = 0;<br>
   bool BuildingFunction = false;<br>
<br>
Modified: llvm/trunk/lib/XRay/Trace.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/XRay/Trace.cpp?rev=341912&r1=341911&r2=341912&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/XRay/Trace.cpp?rev=341912&r1=341911&r2=341912&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/XRay/Trace.cpp (original)<br>
+++ llvm/trunk/lib/XRay/Trace.cpp Tue Sep 11 01:03:30 2018<br>
@@ -317,8 +317,8 @@ Error loadFDRLog(StringRef Data, bool Is<br>
             return (L.WallclockTime->seconds() < R.WallclockTime->seconds() &&<br>
                     L.WallclockTime->nanos() < R.WallclockTime->nanos());<br>
           });<br>
-      TraceExpander Expander([&](const XRayRecord &R) { Records.push_back(R); },<br>
-                             FileHeader.Version);<br>
+      auto Adder = [&](const XRayRecord &R) { Records.push_back(R); };<br>
+      TraceExpander Expander(Adder, FileHeader.Version);<br>
       for (auto &B : Blocks) {<br>
         for (auto *R : B.Records)<br>
           if (auto E = R->apply(Expander))<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>