post-cherry-pick fixes

Author: ergawy

flang/lib/Lower/Support/PrivateReductionUtils.cpp

@@ -515,22 +515,11 @@ void PopulateInitAndCleanupRegionsHelper::initAndCleanupBoxedArray(
     if (shouldAllocateOnStack)
       return createStackTempFromMold(loc, builder, source);
 
-    mlir::Value tempValue;
-    std::optional<int64_t> cstNeedsDealloc;
-    if (isAllocatableOrPointer) {
-      auto [heapTemp, needsDealloc] = createTempFromMold(loc, builder, source);
-      tempValue = heapTemp;
-      cstNeedsDealloc = fir::getIntIfConstant(needsDealloc);
-    } else {
-      tempValue = hlfir::createStackTempFromMold(loc, builder, source);
-      cstNeedsDealloc = false;
-    }
-    hlfir::Entity temp{tempValue};
+    auto [temp, needsDealloc] = createTempFromMold(loc, builder, source);
 
     // if needsDealloc isn't statically false, add cleanup region. Always
     // do this for allocatable boxes because they might have been re-allocated
     // in the body of the loop/parallel region
-
     std::optional<int64_t> cstNeedsDealloc =
         fir::getIntIfConstant(needsDealloc);
     assert(cstNeedsDealloc.has_value() &&

flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90

@@ -1,4 +1,3 @@
-! XFAIL: *
 ! Tests delayed privatization for `targets ... private(..)` for allocatables.
 
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \

flang/test/Lower/OpenMP/delayed-privatization-array.f90

@@ -1,5 +1,4 @@
 ! Test delayed privatization for arrays.
-! XFAIL: *
 
 ! RUN: split-file %s %t
 

flang/test/Lower/OpenMP/parallel-reduction-array-lb.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 
 program reduce
 integer, dimension(2:4, 2) :: i = 0

flang/test/Lower/OpenMP/parallel-reduction-array2.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 
 program reduce
 integer, dimension(3) :: i = 0

flang/test/Lower/OpenMP/parallel-reduction3.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 
 ! CHECK-LABEL:   omp.declare_reduction @add_reduction_byref_box_Uxi32 : !fir.ref<!fir.box<!fir.array<?xi32>>> alloc {
 ! CHECK:           %[[VAL_8:.*]] = fir.alloca !fir.box<!fir.array<?xi32>>

flang/test/Lower/OpenMP/reduction-array-intrinsic.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 
 subroutine max_array_reduction(l, r)
   integer :: l(:), r(:)

flang/test/Lower/OpenMP/taskgroup-task-array-reduction.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -fopenmp-version=50 -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=50 -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 
 ! CHECK-LABEL:  omp.declare_reduction @add_reduction_byref_box_Uxf32 : !fir.ref<!fir.box<!fir.array<?xf32>>> alloc {
 !                 [...]

flang/test/Lower/OpenMP/wsloop-reduction-array-assumed-shape.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s | FileCheck %s
-! XFAIL: *
 
 program reduce_assumed_shape
 real(8), dimension(2) :: r

flang/test/Lower/OpenMP/wsloop-reduction-array.f90

@@ -1,6 +1,5 @@
 ! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s
-! XFAIL: *
 program reduce
 integer :: i = 0
 integer, dimension(2) :: r = 0