#2027: runnable: clever workaround to avoid branching on return type

DARMA-tasking · Feb 8, 2023 · 8820ec9 · 8820ec9
1 parent 703a972
commit 8820ec9
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/vt/runnable/make_runnable.h b/src/vt/runnable/make_runnable.h
@@ -276,18 +276,10 @@ struct RunnableMaker {
   template <typename Callable, typename... Args>
   auto runLambda(Callable&& c, Args&&... args) {
     setup();
-    if constexpr(std::is_void_v<std::invoke_result_t<Callable, Args...>>) {
-      std::invoke(std::forward<Callable>(c), std::forward<Args>(args)...);
-      delete impl_;
-      impl_ = nullptr;
-      is_done_ = true;
-    } else {
-      decltype(auto) r{impl_->runLambda(std::forward<Callable>(c), std::forward<Args>(args)...)};
-      delete impl_;
-      impl_ = nullptr;
-      is_done_ = true;
-      return r;
-    }
+    auto local_impl = std::unique_ptr<RunnableNew>(impl_);
+    impl_ = nullptr;
+    is_done_ = true;
+    return local_impl->runLambda(std::forward<Callable>(c), std::forward<Args>(args)...);
   }
 
   /**