#1983: vrt_coll: do not capture on collection contexts

DARMA-tasking · Mar 30, 2023 · 38833d9 · 38833d9
1 parent c59b95c
commit 38833d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/vt/context/runnable_context/collection.cc b/src/vt/context/runnable_context/collection.cc
@@ -46,7 +46,7 @@
 namespace vt { namespace ctx {
 
 void Collection::start() {
-  set_();
+  set_(elm_);
 }
 
 void Collection::finish() {

diff --git a/src/vt/context/runnable_context/collection.h b/src/vt/context/runnable_context/collection.h
@@ -87,8 +87,9 @@ struct Collection {
   void resume();
 
 private:
-  std::function<void()> set_;   /**< Set context function */
-  std::function<void()> clear_; /**< Clear context function */
+  std::function<void(void* in_elm)> set_;   /**< Set context function */
+  std::function<void()> clear_;             /**< Clear context function */
+  void* elm_ = nullptr;                     /**< The element (untyped) */
 };
 
 }} /* end namespace vt::ctx */

diff --git a/src/vt/context/runnable_context/collection.impl.h b/src/vt/context/runnable_context/collection.impl.h
@@ -54,9 +54,11 @@ template <typename IndexT>
 /*explicit*/ Collection::Collection(
   vrt::collection::Indexable<IndexT>* elm
 ) {
-  auto idx_ = elm->getIndex();
-  auto proxy_ = elm->getProxy();
-  set_ = [=]{
+  elm_ = elm;
+  set_ = [](void* in_elm){
+    auto e = static_cast<vrt::collection::Indexable<IndexT>*>(in_elm);
+    auto& idx_ = e->getIndex();
+    auto proxy_ = e->getProxy();
     vrt::collection::CollectionContextHolder<IndexT>::set(&idx_, proxy_);
   };
   clear_ = []{