diff --git a/flang/lib/Lower/OpenACC.cpp b/flang/lib/Lower/OpenACC.cpp --- a/flang/lib/Lower/OpenACC.cpp +++ b/flang/lib/Lower/OpenACC.cpp @@ -2356,10 +2356,12 @@ createDeclareGlobalOp( modBuilder, builder, operandLocation, globalOp, clause); - createDeclareGlobalOp( - modBuilder, builder, operandLocation, globalOp, clause); + if constexpr (!std::is_same_v) { + createDeclareGlobalOp( + modBuilder, builder, operandLocation, globalOp, clause); + } builder.restoreInsertionPoint(crtPos); } }, @@ -2423,6 +2425,15 @@ Fortran::parser::AccDataModifier::Modifier::Zero, mlir::acc::DataClause::acc_create, mlir::acc::DataClause::acc_create_zero); + } else if (const auto *copyinClause = + std::get_if( + &clause.u)) { + genGlobalCtorsWithModifier( + converter, modBuilder, copyinClause, + Fortran::parser::AccDataModifier::Modifier::ReadOnly, + mlir::acc::DataClause::acc_copyin, + mlir::acc::DataClause::acc_copyin_readonly); } else { TODO(clauseLocation, "OpenACC declare clause"); } diff --git a/flang/test/Lower/OpenACC/acc-declare.f90 b/flang/test/Lower/OpenACC/acc-declare.f90 --- a/flang/test/Lower/OpenACC/acc-declare.f90 +++ b/flang/test/Lower/OpenACC/acc-declare.f90 @@ -41,3 +41,17 @@ ! CHECK: acc.delete accPtr(%[[DEVICEPTR]] : !fir.ref>) {dataClause = #acc, name = "data2", structured = false} ! CHECK: acc.terminator ! CHECK: } + +module acc_declare_copyin_test + integer, parameter :: n = 100000 + real, dimension(n) :: data1 + !$acc declare copyin(data1) +end module + + +! CHECK-LABEL: acc.global_ctor @_QMacc_declare_copyin_testEdata1_acc_ctor { +! CHECK: %[[GLOBAL_ADDR:.*]] = fir.address_of(@_QMacc_declare_copyin_testEdata1) {acc.declare = #acc.declare} : !fir.ref> +! CHECK: %[[COPYIN:.*]] = acc.copyin varPtr(%[[GLOBAL_ADDR]] : !fir.ref>) -> !fir.ref> {name = "data1"} +! CHECK: acc.declare_enter dataOperands(%[[COPYIN]] : !fir.ref>) +! CHECK: acc.terminator +! CHECK: }