diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp index 43375e84f21fa..cf9a322680321 100644 --- a/flang/lib/Lower/Bridge.cpp +++ b/flang/lib/Lower/Bridge.cpp @@ -4778,7 +4778,14 @@ class FirConverter : public Fortran::lower::AbstractConverter { nbDeviceResidentObject <= 1 && "Only one reference to the device resident object is supported"); auto addr = getSymbolAddress(sym); - hlfir::Entity entity{addr}; + mlir::Value baseValue; + if (auto declareOp = + llvm::dyn_cast(addr.getDefiningOp())) + baseValue = declareOp.getBase(); + else + baseValue = addr; + + hlfir::Entity entity{baseValue}; auto [temp, cleanup] = hlfir::createTempFromMold(loc, builder, entity); auto needCleanup = fir::getIntIfConstant(cleanup); diff --git a/flang/test/Lower/CUDA/cuda-managed.cuf b/flang/test/Lower/CUDA/cuda-managed.cuf new file mode 100644 index 0000000000000..e14bd849670b1 --- /dev/null +++ b/flang/test/Lower/CUDA/cuda-managed.cuf @@ -0,0 +1,27 @@ +! RUN: bbc -emit-hlfir -fcuda %s -o - | FileCheck %s + +subroutine testr2(N1,N2) + real(4), managed :: ai4(N1,N2) + real(4), allocatable :: bRefi4(:) + + integer :: i1, i2 + + do i2 = 1, N2 + do i1 = 1, N1 + ai4(i1,i2) = i1 + N1*(i2-1) + enddo + enddo + + allocate(bRefi4 (N1)) + do i1 = 1, N1 + bRefi4(i1) = (ai4(i1,1)+ai4(i1,N2))*N2/2 + enddo + deallocate(bRefi4) + +end subroutine + +!CHECK-LABEL: func.func @_QPtestr2 +!CHECK: %[[ALLOC:.*]] = cuf.alloc !fir.array, %{{.*}}, %{{.*}} : index, index {bindc_name = "ai4", data_attr = #cuf.cuda, uniq_name = "_QFtestr2Eai4"} -> !fir.ref> +!CHECK: %[[DECLARE:.*]]:2 = hlfir.declare %[[ALLOC]](%{{.*}}) {data_attr = #cuf.cuda, uniq_name = "_QFtestr2Eai4"} : (!fir.ref>, !fir.shape<2>) -> (!fir.box>, !fir.ref>) +!CHECK: %[[DEST:.*]] = hlfir.designate %[[DECLARE]]#0 (%{{.*}}, %{{.*}}) : (!fir.box>, i64, i64) -> !fir.ref +!CHECK: cuf.data_transfer %{{.*}}#0 to %[[DEST]] {transfer_kind = #cuf.cuda_transfer} : !fir.ref, !fir.ref