Use Data instead of Box for allocatable array

Author: Thirumalai-Shaktivel

flang/lib/Lower/Bridge.cpp

@@ -3282,16 +3282,21 @@ class FirConverter : public Fortran::lower::AbstractConverter {
                 Fortran::lower::SomeExpr expr{*ea.Analyze(
                     std::get<Fortran::parser::DataRef>(p.value().u))};
                 Fortran::lower::StatementContext stmtCtx;
+                mlir::Location loc = genLocation(dir.source);
                 mlir::Value memRef{Fortran::lower::convertExprToHLFIR(
-                                       genLocation(dir.source), *this, expr,
-                                       localSymbols, stmtCtx)
+                                       loc, *this, expr, localSymbols, stmtCtx)
                                        .getBase()};
+                if (mlir::isa<fir::BaseBoxType>(
+                        fir::unwrapRefType(memRef.getType()))) {
+                  memRef = fir::LoadOp::create(*builder, loc, memRef);
+                  memRef = fir::BoxAddrOp::create(*builder, loc, memRef);
+                }
 
                 // TODO: Don't use default value, instead get the following
                 //       info from the directive
                 uint32_t isWrite{0}, localityHint{3}, isData{1};
-                fir::PrefetchOp::create(*builder, genLocation(dir.source),
-                                        memRef, isWrite, localityHint, isData);
+                fir::PrefetchOp::create(*builder, loc, memRef, isWrite,
+                                        localityHint, isData);
               }
             },
             [&](const auto &) {}},

flang/test/Lower/HLFIR/prefetch.f90

@@ -50,7 +50,9 @@ subroutine test_prefetch_02(t1)
   a = t1%a ** 2
 
   do i = 1, 256
-    ! HLFIR: fir.prefetch %[[H_A]]#0 {cacheType, localityHint = 3 : i32} : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>
+    ! HLFIR: %[[A_LOAD:.*]] = fir.load %[[H_A]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>
+    ! HLFIR: %[[A_BOX:.*]] = fir.box_addr %[[A_LOAD]] : (!fir.box<!fir.heap<!fir.array<?x?xi32>>>) -> !fir.heap<!fir.array<?x?xi32>>
+    ! HLFIR: fir.prefetch %[[A_BOX]] {cacheType, localityHint = 3 : i32} : !fir.heap<!fir.array<?x?xi32>>
     !dir$ prefetch a
     a(i, :) = a(i, :) + i
     do j = 1, 256