Revert "[OpenMP][MLIR] Preserve to/from flags in mapper base entry for mappers (llvm#159799)"

This reverts commit 8afea0d.

Author: ronlieb

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

@@ -4299,30 +4299,13 @@ mapParentWithMembers(LLVM::ModuleTranslation &moduleTranslation,
   assert(!ompBuilder.Config.isTargetDevice() &&
          "function only supported for host device codegen");
 
-  // Map the first segment of the parent. If a user-defined mapper is attached,
-  // include the parent's to/from-style bits (and common modifiers) in this
-  // base entry so the mapper receives correct copy semantics via its 'type'
-  // parameter. Also keep TARGET_PARAM when required for kernel arguments.
-  llvm::omp::OpenMPOffloadMappingFlags baseFlag =
-      isTargetParams
+  // Map the first segment of our structure
+  const size_t parentIndex = combinedInfo.Types.size();
+  combinedInfo.Types.emplace_back(
+      (targetDirective == TargetDirective::Target &&
+       !mapData.IsDeclareTarget[mapDataIndex])
           ? llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TARGET_PARAM
-          : llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_NONE;
-
-  // Detect if this mapping uses a user-defined mapper.
-  bool hasUserMapper = mapData.Mappers[mapDataIndex] != nullptr;
-  if (hasUserMapper) {
-    using mapFlags = llvm::omp::OpenMPOffloadMappingFlags;
-    // Preserve relevant map-type bits from the parent clause. These include
-    // the copy direction (TO/FROM), as well as commonly used modifiers that
-    // should be visible to the mapper for correct behaviour.
-    mapFlags parentFlags = mapData.Types[mapDataIndex];
-    mapFlags preserve = mapFlags::OMP_MAP_TO | mapFlags::OMP_MAP_FROM |
-                        mapFlags::OMP_MAP_ALWAYS | mapFlags::OMP_MAP_CLOSE |
-                        mapFlags::OMP_MAP_PRESENT | mapFlags::OMP_MAP_OMPX_HOLD;
-    baseFlag |= (parentFlags & preserve);
-  }
-
-  combinedInfo.Types.emplace_back(baseFlag);
+          : llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_NONE);
   combinedInfo.DevicePointers.emplace_back(
       mapData.DevicePointers[mapDataIndex]);
   combinedInfo.Mappers.emplace_back(mapData.Mappers[mapDataIndex]);

offload/test/offloading/fortran/target-declare-mapper-allocatable.f90

@@ -19,3 +19,5 @@ needs more offload patches
 [Offload] Port llvm-offload-device-info to new offload API (#155626)
 [Offload]  Implement 'olIsValidBinary' in offload
 ---
+akashB: 8afea0d0ea1c [OpenMP][MLIR] Preserve to/from flags in mappe
+---