post-reland fixes

Author: ergawy

flang/lib/Lower/OpenMP/DataSharingProcessor.cpp

@@ -12,7 +12,6 @@
 
 #include "DataSharingProcessor.h"
 
-#include "Utils.h"
 #include "flang/Lower/ConvertVariable.h"
 #include "flang/Lower/OpenMP/Utils.h"
 #include "flang/Lower/PFTBuilder.h"

flang/test/Lower/do_concurrent_local_assoc_entity.f90

@@ -14,9 +14,9 @@ end subroutine local_assoc
 
 ! CHECK: fir.local {type = local} @[[LOCALIZER:.*local_assocEa.*]] : !fir.box<!fir.array<8xf32>> init {
 ! CHECK-NEXT: ^{{.*}}(%{{.*}}: !{{.*}}, %[[LOCAL_ARG:.*]]: !{{.*}}):
+! CHECK-NEXT:   %[[TMP_ALLOC:.*]] = fir.alloca !{{.*}} {bindc_name = ".tmp"}
 ! CHECK-NEXT:   %[[C8:.*]] = arith.constant 8 : index
 ! CHECK-NEXT:   %[[SHAPE:.*]] = fir.shape %[[C8]]
-! CHECK-NEXT:   %[[TMP_ALLOC:.*]] = fir.allocmem !{{.*}} {bindc_name = ".tmp", {{.*}}}
 ! CHECK:        %[[TMP_DECL:.*]]:2 = hlfir.declare %[[TMP_ALLOC]](%[[SHAPE]])
 ! CHECK:        %[[C1:.*]] = arith.constant 1 : index
 ! CHECK-NEXT:   %[[C8:.*]] = arith.constant 8 : index