Address reviewer comments.

Author: TIFitis

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

@@ -1346,11 +1346,8 @@ void ClauseProcessor::processMapObjects(
         std::string mapperIdName = getDefaultMapperID(objectTypeSpec);
         bool needsDefaultMapper =
             semantics::IsAllocatableOrObjectPointer(object.sym()) ||
-            (objectTypeSpec &&
-             requiresImplicitDefaultDeclareMapper(*objectTypeSpec));
-        bool containsDelete = (mapTypeBits & mlir::omp::ClauseMapFlags::del) !=
-                              mlir::omp::ClauseMapFlags::none;
-        if (!mapperIdName.empty() && !containsDelete)
+            requiresImplicitDefaultDeclareMapper(*objectTypeSpec);
+        if (!mapperIdName.empty())
           mapperId = addImplicitMapper(object, mapperIdName,
                                        /*allowGenerate=*/needsDefaultMapper);
         else

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -2599,6 +2599,9 @@ genTargetOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
 
       mlir::FlatSymbolRefAttr mapperId;
       if (defaultMaps.empty()) {
+        // TODO: Honor user-provided defaultmap clauses (aggregates/pointers)
+        // instead of blanket-disabling implicit mapper generation whenever any
+        // explicit default map is present.
         const semantics::DerivedTypeSpec *typeSpec =
             sym.GetType() ? sym.GetType()->AsDerived() : nullptr;
         if (typeSpec) {

flang/lib/Lower/OpenMP/Utils.cpp

@@ -118,9 +118,9 @@ mlir::FlatSymbolRefAttr getOrGenImplicitDefaultDeclareMapper(
   llvm::SmallVector<llvm::SmallVector<int64_t>> memberPlacementIndices;
   llvm::SmallVector<mlir::Value> memberMapOps;
 
-  mlir::omp::ClauseMapFlags mapFlag = mlir::omp::ClauseMapFlags::to;
-  mapFlag |= mlir::omp::ClauseMapFlags::from;
-  mapFlag |= mlir::omp::ClauseMapFlags::implicit;
+  mlir::omp::ClauseMapFlags mapFlag = mlir::omp::ClauseMapFlags::to |
+                                      mlir::omp::ClauseMapFlags::from |
+                                      mlir::omp::ClauseMapFlags::implicit;
   mlir::omp::VariableCaptureKind captureKind =
       mlir::omp::VariableCaptureKind::ByRef;
 
@@ -159,9 +159,7 @@ mlir::FlatSymbolRefAttr getOrGenImplicitDefaultDeclareMapper(
 
   llvm::SmallVector<mlir::Value> bounds;
   genBoundsOps(declareOp.getOriginalBase(), bounds);
-  mlir::omp::ClauseMapFlags parentMapFlag = mlir::omp::ClauseMapFlags::to;
-  parentMapFlag |= mlir::omp::ClauseMapFlags::from;
-  parentMapFlag |= mlir::omp::ClauseMapFlags::implicit;
+  mlir::omp::ClauseMapFlags parentMapFlag = mlir::omp::ClauseMapFlags::implicit;
   mlir::omp::MapInfoOp mapOp = Fortran::utils::openmp::createMapInfoOp(
       firOpBuilder, loc, declareOp.getOriginalBase(),
       /*varPtrPtr=*/mlir::Value(), /*name=*/"", bounds, memberMapOps,

offload/test/offloading/fortran/implicit-derived-enter-exit.f90

@@ -0,0 +1,65 @@
+! REQUIRES: flang, amdgpu
+
+! RUN: %libomptarget-compile-fortran-generic
+! RUN: %libomptarget-run-generic 2>&1 | %fcheck-generic
+
+module enter_exit_mapper_mod
+  implicit none
+
+  type :: field_type
+    real, allocatable :: values(:)
+  end type field_type
+
+  type :: tile_type
+    type(field_type) :: field
+    integer, allocatable :: neighbors(:)
+  end type tile_type
+
+contains
+  subroutine init_tile(tile)
+    type(tile_type), intent(inout) :: tile
+    integer :: j
+
+    allocate(tile%field%values(4))
+    allocate(tile%neighbors(4))
+    do j = 1, 4
+      tile%field%values(j) = 10.0 * j
+      tile%neighbors(j) = j
+    end do
+  end subroutine init_tile
+
+end module enter_exit_mapper_mod
+
+program implicit_enter_exit
+  use enter_exit_mapper_mod
+  implicit none
+  integer :: j
+  type(tile_type) :: tile
+
+  call init_tile(tile)
+
+  !$omp target enter data map(alloc: tile%field%values)
+
+  !$omp target
+  do j = 1, size(tile%field%values)
+    tile%field%values(j) = 5.0 * j
+  end do
+  !$omp end target
+
+  !$omp target exit data map(from: tile%field%values)
+
+  do j = 1, size(tile%field%values)
+    if (tile%field%values(j) /= 5.0 * j) then
+      print *, "======= Test Failed! ======="
+      stop 1
+    end if
+    if (tile%neighbors(j) /= j) then
+      print *, "======= Test Failed! ======="
+      stop 1
+    end if
+  end do
+
+  print *, "======= Test Passed! ======="
+end program implicit_enter_exit
+
+! CHECK: ======= Test Passed! =======