From 8bfce3ed35f7597ce59278a845e9be6d75609a41 Mon Sep 17 00:00:00 2001 From: Andrii Grynenko Date: Tue, 21 Nov 2017 20:58:05 -0800 Subject: [PATCH 1/1] Fix ASAN failure in FutureDAG test Summary: dogscience Reviewed By: yfeldblum Differential Revision: D6387604 fbshipit-source-id: 3e33da3e3c6801d6e2186637c8fb6adaf1eef6f6 --- folly/experimental/FutureDAG.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/folly/experimental/FutureDAG.h b/folly/experimental/FutureDAG.h index 48d8dd2d..ee3dcffb 100644 --- a/folly/experimental/FutureDAG.h +++ b/folly/experimental/FutureDAG.h @@ -134,10 +134,9 @@ class FutureDAG : public std::enable_shared_from_this { } nodes[sourceHandle].promise.setValue(); - auto that = shared_from_this(); - return nodes[sinkHandle].promise.getFuture().ensure([that] {}).then( - [this, sourceHandle, sinkHandle]() { - clean_state(sourceHandle, sinkHandle); + return nodes[sinkHandle].promise.getFuture().then( + [that = shared_from_this(), sourceHandle, sinkHandle]() { + that->clean_state(sourceHandle, sinkHandle); }); } -- 2.34.1