Fix read of dangling reference (NVIDIA#2290)

Fixes: NVIDIA#2289
pciolkosz · Aug 27, 2024 · fe31aec · fe31aec
1 parent a720f87
commit fe31aec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/thrust/testing/functional_placeholders_miscellaneous.cu b/thrust/testing/functional_placeholders_miscellaneous.cu
@@ -80,17 +80,14 @@ VectorUnitTest<TestFunctionalPlaceholdersTransformIterator,
 VectorUnitTest<TestFunctionalPlaceholdersTransformIterator, ThirtyTwoBitTypes, thrust::host_vector, std::allocator>
   TestFunctionalPlaceholdersTransformIteratorInstanceHost;
 
-template <typename T>
-struct TestFunctionalPlaceholdersArgumentValueCategories
+void TestFunctionalPlaceholdersArgumentValueCategories()
 {
-  void operator()() const
-  {
-    using namespace thrust::placeholders;
-    auto expr = _1 * _1 + _2 * _2;
-    T a       = 2;
-    T b       = 3;
-    ASSERT_ALMOST_EQUAL(expr(2, 3), 13); // pass pr-value
-    ASSERT_ALMOST_EQUAL(expr(a, b), 13); // pass l-value
-    ASSERT_ALMOST_EQUAL(expr(::cuda::std::move(a), ::cuda::std::move(b)), 13); // pass x-value
-  }
-};
+  using namespace thrust::placeholders;
+  auto expr = _1 * _1 + _2 * _2;
+  int a     = 2;
+  int b     = 3;
+  ASSERT_EQUAL(expr(2, 3), 13); // pass pr-value
+  ASSERT_EQUAL(expr(a, b), 13); // pass l-value
+  ASSERT_EQUAL(expr(::cuda::std::move(a), ::cuda::std::move(b)), 13); // pass x-value
+}
+DECLARE_UNITTEST(TestFunctionalPlaceholdersArgumentValueCategories);
diff --git a/thrust/thrust/detail/functional/actor.h b/thrust/thrust/detail/functional/actor.h
@@ -83,9 +83,9 @@ struct argument
 {
   template <typename... Ts>
   _CCCL_HOST_DEVICE auto
-  eval(Ts&&... args) const -> decltype(thrust::get<Pos>(thrust::tuple<Ts...>{THRUST_FWD(args)...}))
+  eval(Ts&&... args) const -> decltype(thrust::get<Pos>(thrust::tuple<Ts&&...>{THRUST_FWD(args)...}))
   {
-    return thrust::get<Pos>(thrust::tuple<Ts...>{THRUST_FWD(args)...});
+    return thrust::get<Pos>(thrust::tuple<Ts&&...>{THRUST_FWD(args)...});
   }
 };