From f07a6606e44d7bba88efa55615075a917704bde1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 14 Jul 2022 17:01:18 +0200
Subject: Set builtin result while holding mutex

While the original code was probably correct, there is suspicion this
is causing a TSAN false-positive.
---
 libbutl/builtin.ixx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'libbutl/builtin.ixx')

diff --git a/libbutl/builtin.ixx b/libbutl/builtin.ixx
index 24fbae3..d77590b 100644
--- a/libbutl/builtin.ixx
+++ b/libbutl/builtin.ixx
@@ -47,13 +47,14 @@ namespace butl
   //
   template <typename F>
   inline builtin::async_state::
-  async_state (F f)
-      : thread ([f = std::move (f), this] () mutable noexcept
+  async_state (uint8_t& r, F f)
+      : thread ([this, &r, f = std::move (f)] () mutable noexcept
                 {
-                  f ();
+                  uint8_t t (f ());
 
                   {
                     unique_lock l (this->mutex);
+                    r = t;
                     finished = true;
                   }
 
@@ -68,9 +69,10 @@ namespace butl
   {
     std::unique_ptr<builtin::async_state> s (
       new builtin::async_state (
-        [f = std::move (f), &r] () mutable noexcept
+        r,
+        [f = std::move (f)] () mutable noexcept -> uint8_t
         {
-          r = f ();
+          return f ();
         }));
 
     return builtin (r, move (s));
-- 
cgit v1.1