Address issues in algorithms identified by static analysis (#1340) (#1343)

timmiesmith · web-flow · commit 8a48f19bec3b · 2024-01-12T15:01:24.000-06:00
diff --git a/include/oneapi/dpl/pstl/hetero/algorithm_impl_hetero.h b/include/oneapi/dpl/pstl/hetero/algorithm_impl_hetero.h
@@ -1506,7 +1506,7 @@ __pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _InIterator __first, _InI
 template <typename _ExecutionPolicy, typename _Iterator, typename _Compare>
 oneapi::dpl::__internal::__enable_if_hetero_execution_policy<_ExecutionPolicy>
 __pattern_nth_element(_ExecutionPolicy&& __exec, _Iterator __first, _Iterator __nth, _Iterator __last, _Compare __comp,
-                      /*vector*/ ::std::true_type, /*parallel*/ ::std::true_type) noexcept
+                      /*vector*/ ::std::true_type, /*parallel*/ ::std::true_type)
 {
     if (__first == __last || __nth == __last)
         return;
diff --git a/include/oneapi/dpl/pstl/hetero/numeric_ranges_impl_hetero.h b/include/oneapi/dpl/pstl/hetero/numeric_ranges_impl_hetero.h
@@ -93,6 +93,7 @@ __pattern_transform_scan_base(_ExecutionPolicy&& __exec, _Range1&& __rng1, _Rang
 {
     if (__rng1.empty())
         return 0;
+    oneapi::dpl::__internal::__difference_t<_Range2> __rng1_size = __rng1.size();
 
     using _Type = typename _InitType::__value_type;
     using _Assigner = unseq_backend::__scan_assigner;
@@ -118,7 +119,7 @@ __pattern_transform_scan_base(_ExecutionPolicy&& __exec, _Range1&& __rng1, _Rang
         // global scan
         unseq_backend::__global_scan_functor<_Inclusive, _BinaryOperation, _InitType>{__binary_op, __init})
         .wait();
-    return __rng1.size();
+    return __rng1_size;
 }
 
 template <typename _ExecutionPolicy, typename _Range1, typename _Range2, typename _UnaryOperation, typename _Type,

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ __pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _InIterator __first, _InI`
`1506`	`1506`	`template <typename _ExecutionPolicy, typename _Iterator, typename _Compare>`
`1507`	`1507`	`oneapi::dpl::__internal::__enable_if_hetero_execution_policy<_ExecutionPolicy>`
`1508`	`1508`	`__pattern_nth_element(_ExecutionPolicy&& __exec, _Iterator __first, _Iterator __nth, _Iterator __last, _Compare __comp,`
`1509`		`- /vector/ ::std::true_type, /parallel/ ::std::true_type) noexcept`
	`1509`	`+ /vector/ ::std::true_type, /parallel/ ::std::true_type)`
`1510`	`1510`	`{`
`1511`	`1511`	`if (__first == __last \|\| __nth == __last)`
`1512`	`1512`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ __pattern_transform_scan_base(_ExecutionPolicy&& __exec, _Range1&& __rng1, _Rang`
`93`	`93`	`{`
`94`	`94`	`if (__rng1.empty())`
`95`	`95`	`return 0;`
	`96`	`+ oneapi::dpl::__internal::__difference_t<_Range2> __rng1_size = __rng1.size();`
`96`	`97`
`97`	`98`	`using _Type = typename _InitType::__value_type;`
`98`	`99`	`using _Assigner = unseq_backend::__scan_assigner;`
`@@ -118,7 +119,7 @@ __pattern_transform_scan_base(_ExecutionPolicy&& __exec, _Range1&& __rng1, _Rang`
`118`	`119`	`// global scan`
`119`	`120`	`unseq_backend::__global_scan_functor<_Inclusive, _BinaryOperation, _InitType>{__binary_op, __init})`
`120`	`121`	`.wait();`
`121`		`- return __rng1.size();`
	`122`	`+ return __rng1_size;`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`template <typename _ExecutionPolicy, typename _Range1, typename _Range2, typename _UnaryOperation, typename _Type,`