Code cleanup.

Author: TIFitis

flang/lib/Lower/OpenMP/ClauseProcessor.cpp

@@ -1233,43 +1233,34 @@ void ClauseProcessor::processMapObjects(
     return nullptr;
   };
 
-  auto addImplicitmapper = [&](const omp::Object &object,
+  auto addImplicitMapper = [&](const omp::Object &object,
                                std::string &mapperIdName,
                                bool allowGenerate) -> mlir::FlatSymbolRefAttr {
     if (mapperIdName.empty())
       return mlir::FlatSymbolRefAttr();
 
-    bool symbolExists = converter.getModuleOp().lookupSymbol(mapperIdName);
-    if (!symbolExists && !allowGenerate)
-      return mlir::FlatSymbolRefAttr();
-
-    auto getOrCreateMapperAttr = [&]() -> mlir::FlatSymbolRefAttr {
-      if (symbolExists)
-        return mlir::FlatSymbolRefAttr::get(&converter.getMLIRContext(),
-                                            mapperIdName);
-
-      const semantics::DerivedTypeSpec *typeSpec =
-          getSymbolDerivedType(*object.sym());
-      if (!typeSpec && object.sym()->owner().IsDerivedType())
-        typeSpec = object.sym()->owner().derivedTypeSpec();
+    if (converter.getModuleOp().lookupSymbol(mapperIdName))
+      return mlir::FlatSymbolRefAttr::get(&converter.getMLIRContext(),
+                                          mapperIdName);
 
-      if (!typeSpec)
-        return mlir::FlatSymbolRefAttr();
+    if (!allowGenerate)
+      return mlir::FlatSymbolRefAttr();
 
-      mlir::Type type = converter.genType(*typeSpec);
-      auto recordType = mlir::dyn_cast<fir::RecordType>(type);
-      if (!recordType)
-        return mlir::FlatSymbolRefAttr();
+    const semantics::DerivedTypeSpec *typeSpec =
+        getSymbolDerivedType(*object.sym());
+    if (!typeSpec && object.sym()->owner().IsDerivedType())
+      typeSpec = object.sym()->owner().derivedTypeSpec();
 
-      return getOrGenImplicitDefaultDeclareMapper(converter, clauseLocation,
-                                                  recordType, mapperIdName);
-    };
+    if (!typeSpec)
+      return mlir::FlatSymbolRefAttr();
 
-    mlir::FlatSymbolRefAttr mapperAttr = getOrCreateMapperAttr();
-    if (!mapperAttr)
+    mlir::Type type = converter.genType(*typeSpec);
+    auto recordType = mlir::dyn_cast<fir::RecordType>(type);
+    if (!recordType)
       return mlir::FlatSymbolRefAttr();
 
-    return mapperAttr;
+    return getOrGenImplicitDefaultDeclareMapper(converter, clauseLocation,
+                                                recordType, mapperIdName);
   };
 
   auto getDefaultMapperID = [&](const semantics::DerivedTypeSpec *typeSpec,
@@ -1364,13 +1355,9 @@ void ClauseProcessor::processMapObjects(
             semantics::IsAllocatableOrObjectPointer(object.sym());
         bool containsDelete = (mapTypeBits & mlir::omp::ClauseMapFlags::del) !=
                               mlir::omp::ClauseMapFlags::none;
-        bool mapperExists = !mapperIdName.empty() &&
-                            converter.getModuleOp().lookupSymbol(mapperIdName);
-        if ((needsDefaultMapper || mapperExists) && !mapperIdName.empty() &&
-            !containsDelete)
-          mapperId = addImplicitmapper(object, mapperIdName,
-                                       /*allowGenerate=*/needsDefaultMapper &&
-                                           !mapperExists);
+        if (!mapperIdName.empty() && !containsDelete)
+          mapperId = addImplicitMapper(object, mapperIdName,
+                                       /*allowGenerate=*/needsDefaultMapper);
         else
           mapperId = mlir::FlatSymbolRefAttr();
       }

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -2617,18 +2617,16 @@ genTargetOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
 
           std::string mapperIdName = getDefaultMapperName();
           if (!mapperIdName.empty()) {
-            bool mapperExists =
-                converter.getModuleOp().lookupSymbol(mapperIdName);
             bool allowImplicitMapper =
                 semantics::IsAllocatableOrObjectPointer(&sym);
-            if (mapperExists || allowImplicitMapper) {
-              if (!mapperExists) {
-                auto recordType = mlir::dyn_cast_or_null<fir::RecordType>(
-                    converter.genType(*typeSpec));
-                if (recordType)
-                  mapperId = getOrGenImplicitDefaultDeclareMapper(
-                      converter, loc, recordType, mapperIdName);
-              } else {
+            bool hasDefaultMapper =
+                converter.getModuleOp().lookupSymbol(mapperIdName);
+            if (hasDefaultMapper || allowImplicitMapper) {
+              if (auto recordType = mlir::dyn_cast_or_null<fir::RecordType>(
+                      converter.genType(*typeSpec))) {
+                mapperId = getOrGenImplicitDefaultDeclareMapper(
+                    converter, loc, recordType, mapperIdName);
+              } else if (hasDefaultMapper) {
                 mapperId = mlir::FlatSymbolRefAttr::get(
                     &converter.getMLIRContext(), mapperIdName);
               }

flang/lib/Lower/OpenMP/Utils.cpp

@@ -14,6 +14,7 @@
 
 #include "ClauseFinder.h"
 #include "flang/Evaluate/fold.h"
+#include "flang/Evaluate/tools.h"
 #include <flang/Lower/AbstractConverter.h>
 #include <flang/Lower/ConvertType.h>
 #include <flang/Lower/DirectivesCommon.h>
@@ -170,10 +171,7 @@ mlir::FlatSymbolRefAttr getOrGenImplicitDefaultDeclareMapper(
 
 bool requiresImplicitDefaultDeclareMapper(
     const semantics::DerivedTypeSpec &typeSpec) {
-  std::string rawName = typeSpec.name().ToString();
-  std::string loweredName = llvm::StringRef(rawName).lower();
-  llvm::StringRef typeNameRef(loweredName);
-  if (typeNameRef.contains("c_ptr") || typeNameRef.contains("c_funptr"))
+  if (semantics::IsIsoCType(&typeSpec))
     return true;
 
   llvm::SmallPtrSet<const semantics::DerivedTypeSpec *, 8> visited;