[NFC] Update based on review comments

> Moved to using a type-alias for the tuple > Made names a little more consistent and OpenMP specific

Author: agozillon

flang/include/flang/Lower/OpenMP.h

@@ -13,11 +13,11 @@
 #ifndef FORTRAN_LOWER_OPENMP_H
 #define FORTRAN_LOWER_OPENMP_H
 
+#include "llvm/ADT/SmallVector.h"
+
 #include <cinttypes>
 #include <utility>
 
-#include "llvm/ADT/SmallVector.h"
-
 namespace mlir {
 class Value;
 class Operation;
@@ -52,6 +52,11 @@ struct Evaluation;
 struct Variable;
 } // namespace pft
 
+using OMPDeferredDeclTarInfo =
+ std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
+ uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
+ Fortran::semantics::Symbol>;
+
 // Generate the OpenMP terminator for Operation at Location.
 mlir::Operation *genOpenMPTerminator(fir::FirOpBuilder &, mlir::Operation *,
  mlir::Location);
@@ -89,19 +94,13 @@ bool isOpenMPDeviceDeclareTarget(Fortran::lower::AbstractConverter &,
  Fortran::semantics::SemanticsContext &,
  Fortran::lower::pft::Evaluation &,
  const parser::OpenMPDeclarativeConstruct &);
-void gatherDeferredDeclareTargets(
+void gatherOpenMPDeferredDeclareTargets(
  Fortran::lower::AbstractConverter &, Fortran::semantics::SemanticsContext &,
  Fortran::lower::pft::Evaluation &,
  const parser::OpenMPDeclarativeConstruct &,
- llvm::SmallVectorImpl<std::tuple<
- uint32_t /*mlir::omp::DeclareTargetCaptureClause*/, uint32_t,
- /*mlir::omp::DeclareTargetDeviceType*/ Fortran::semantics::Symbol>> &);
-bool markDelayedDeclareTargetFunctions(
- mlir::Operation *,
- llvm::SmallVectorImpl<
- std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
- uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
- Fortran::semantics::Symbol>> &,
+ llvm::SmallVectorImpl<OMPDeferredDeclTarInfo> &);
+bool markOpenMPDeferredDeclareTargetFunctions(
+ mlir::Operation *, llvm::SmallVectorImpl<OMPDeferredDeclTarInfo> &,
  AbstractConverter &);
 void genOpenMPRequires(mlir::Operation *, const Fortran::semantics::Symbol *);
 

flang/lib/Lower/Bridge.cpp

@@ -2472,9 +2472,9 @@ class FirConverter : public Fortran::lower::AbstractConverter {
  ompDeviceCodeFound ||
  Fortran::lower::isOpenMPDeviceDeclareTarget(
  *this, bridge.getSemanticsContext(), getEval(), ompDecl);
- Fortran::lower::gatherDeferredDeclareTargets(
+ Fortran::lower::gatherOpenMPDeferredDeclareTargets(
  *this, bridge.getSemanticsContext(), getEval(), ompDecl,
- deferredDeclareTarget);
+ ompDeferredDeclareTarget);
  genOpenMPDeclarativeConstruct(
  *this, localSymbols, bridge.getSemanticsContext(), getEval(), ompDecl);
  builder->restoreInsertionPoint(insertPt);
@@ -5004,10 +5004,10 @@ class FirConverter : public Fortran::lower::AbstractConverter {
  /// lowering.
  void finalizeOpenMPLowering(
  const Fortran::semantics::Symbol *globalOmpRequiresSymbol) {
- if (!deferredDeclareTarget.empty()) {
+ if (!ompDeferredDeclareTarget.empty()) {
  bool deferredDeviceFuncFound =
- Fortran::lower::markDelayedDeclareTargetFunctions(
- getModuleOp().getOperation(), deferredDeclareTarget, *this);
+ Fortran::lower::markOpenMPDeferredDeclareTargetFunctions(
+ getModuleOp().getOperation(), ompDeferredDeclareTarget, *this);
  if (!ompDeviceCodeFound)
  ompDeviceCodeFound = deferredDeviceFuncFound;
  }
@@ -5072,12 +5072,8 @@ class FirConverter : public Fortran::lower::AbstractConverter {
  /// processed at the time of lowering the declare target construct, such
  /// as certain cases where interfaces are declared but not defined within
  /// a module.
- llvm::SmallVector<
- std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
- uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
- Fortran::semantics::Symbol>,
- 2>
- deferredDeclareTarget;
+ llvm::SmallVector<Fortran::lower::OMPDeferredDeclTarInfo, 2>
+ ompDeferredDeclareTarget;
 
  const Fortran::lower::ExprToValueMap *exprValueOverrides{nullptr};
 

flang/lib/Lower/OpenMP.cpp

@@ -3187,10 +3187,8 @@ static void insertDeferredDeclareTargets(
  Fortran::semantics::SemanticsContext &semaCtx,
  Fortran::lower::pft::Evaluation &eval,
  const Fortran::parser::OpenMPDeclareTargetConstruct &declareTargetConstruct,
- llvm::SmallVectorImpl<
- std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
- uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
- Fortran::semantics::Symbol>> &deferredDeclareTarget) {
+ llvm::SmallVectorImpl<Fortran::lower::OMPDeferredDeclTarInfo>
+ &deferredDeclareTarget) {
  llvm::SmallVector<DeclareTargetCapturePair, 0> symbolAndClause;
  mlir::omp::DeclareTargetDeviceType devType = getDeclareTargetInfo(
  converter, semaCtx, eval, declareTargetConstruct, symbolAndClause);
@@ -4485,15 +4483,12 @@ bool Fortran::lower::isOpenMPTargetConstruct(
  return llvm::omp::allTargetSet.test(dir);
 }
 
-void Fortran::lower::gatherDeferredDeclareTargets(
+void Fortran::lower::gatherOpenMPDeferredDeclareTargets(
  Fortran::lower::AbstractConverter &converter,
  Fortran::semantics::SemanticsContext &semaCtx,
  Fortran::lower::pft::Evaluation &eval,
  const Fortran::parser::OpenMPDeclarativeConstruct &ompDecl,
- llvm::SmallVectorImpl<
- std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
- uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
- Fortran::semantics::Symbol>> &deferredDeclareTarget) {
+ llvm::SmallVectorImpl<OMPDeferredDeclTarInfo> &deferredDeclareTarget) {
  std::visit(
  Fortran::common::visitors{
  [&](const Fortran::parser::OpenMPDeclareTargetConstruct &ompReq) {
@@ -4531,12 +4526,9 @@ bool Fortran::lower::isOpenMPDeviceDeclareTarget(
 // This function will also return true if we encounter any device declare
 // target cases, to satisfy checking if we require the requires attributes
 // on the module.
-bool Fortran::lower::markDelayedDeclareTargetFunctions(
+bool Fortran::lower::markOpenMPDeferredDeclareTargetFunctions(
  mlir::Operation *mod,
- llvm::SmallVectorImpl<
- std::tuple<uint32_t /*mlir::omp::DeclareTargetCaptureClause*/,
- uint32_t, /*mlir::omp::DeclareTargetDeviceType*/
- Fortran::semantics::Symbol>> &deferredDeclareTargets,
+ llvm::SmallVectorImpl<OMPDeferredDeclTarInfo> &deferredDeclareTargets,
  AbstractConverter &converter) {
  bool deviceCodeFound = false;
  if (auto modOp = llvm::dyn_cast<mlir::ModuleOp>(mod)) {