https://github.com/jeanPerier created
https://github.com/llvm/llvm-project/pull/130290
Reland #114002 with an implementation of the FIXME that should solve the
regressions that have been seen.
The first commit is the original PR, the second is the fix.
>From ad33569ce2ff3a97ea9767817e37ea85119dd5f9 Mon Sep 17 00:00:00 2001
From: Jean Perier <jper...@nvidia.com>
Date: Fri, 7 Mar 2025 06:51:29 -0800
Subject: [PATCH 1/2] Revert "Revert " [flang] Rely on global initialization
for simpler derived types" (#130278)"
This reverts commit d31a7dde485461f564a6ae995a3fd58b2aa1bfa5.
---
.../flang/Optimizer/Support/InternalNames.h | 1 +
flang/lib/Lower/ConvertVariable.cpp | 63 ++++++++++++++++++-
.../Lower/HLFIR/structure-constructor.f90 | 63 +++++++------------
.../Lower/OpenMP/private-derived-type.f90 | 15 ++---
flang/test/Lower/default-initialization.f90 | 48 +++++++-------
.../test/Lower/derived-type-finalization.f90 | 9 ++-
flang/test/Lower/derived-type-temp.f90 | 8 +--
.../Lower/forall/forall-allocatable-2.f90 | 9 +--
flang/test/Lower/pointer-default-init.f90 | 5 +-
9 files changed, 131 insertions(+), 90 deletions(-)
diff --git a/flang/include/flang/Optimizer/Support/InternalNames.h
b/flang/include/flang/Optimizer/Support/InternalNames.h
index 41f2cb9842dc7..62375ab8f9de3 100644
--- a/flang/include/flang/Optimizer/Support/InternalNames.h
+++ b/flang/include/flang/Optimizer/Support/InternalNames.h
@@ -30,6 +30,7 @@ static constexpr llvm::StringRef kProcPtrSeparator = ".p.";
static constexpr llvm::StringRef kSpecialBindingSeparator = ".s.";
static constexpr llvm::StringRef kBindingTableSeparator = ".v.";
static constexpr llvm::StringRef boxprocSuffix = "UnboxProc";
+static constexpr llvm::StringRef kDerivedTypeInitSuffix = "DerivedInit";
/// Internal name mangling of identifiers
///
diff --git a/flang/lib/Lower/ConvertVariable.cpp
b/flang/lib/Lower/ConvertVariable.cpp
index 48f7b9f99e960..8a7be19f8040b 100644
--- a/flang/lib/Lower/ConvertVariable.cpp
+++ b/flang/lib/Lower/ConvertVariable.cpp
@@ -798,8 +798,67 @@ void Fortran::lower::defaultInitializeAtRuntime(
})
.end();
} else {
- mlir::Value box = builder.createBox(loc, exv);
- fir::runtime::genDerivedTypeInitialize(builder, loc, box);
+ /// For "simpler" types, relying on "_FortranAInitialize"
+ /// leads to poor runtime performance. Hence optimize
+ /// the same.
+ const Fortran::semantics::DeclTypeSpec *declTy = sym.GetType();
+ mlir::Type symTy = converter.genType(sym);
+ const auto *details =
+ sym.detailsIf<Fortran::semantics::ObjectEntityDetails>();
+ if (details && !Fortran::semantics::IsPolymorphic(sym) &&
+ declTy->category() ==
+ Fortran::semantics::DeclTypeSpec::Category::TypeDerived &&
+ !mlir::isa<fir::SequenceType>(symTy) &&
+ !sym.test(Fortran::semantics::Symbol::Flag::OmpPrivate) &&
+ !sym.test(Fortran::semantics::Symbol::Flag::OmpFirstPrivate)) {
+ std::string globalName = fir::NameUniquer::doGenerated(
+ (converter.mangleName(*declTy->AsDerived()) + fir::kNameSeparator +
+ fir::kDerivedTypeInitSuffix)
+ .str());
+ mlir::Location loc = genLocation(converter, sym);
+ mlir::StringAttr linkage = builder.createInternalLinkage();
+ fir::GlobalOp global = builder.getNamedGlobal(globalName);
+ if (!global && details->init()) {
+ global = builder.createGlobal(loc, symTy, globalName, linkage,
+ mlir::Attribute{},
+ /*isConst=*/true,
+ /*isTarget=*/false,
+ /*dataAttr=*/{});
+ Fortran::lower::createGlobalInitialization(
+ builder, global, [&](fir::FirOpBuilder &builder) {
+ Fortran::lower::StatementContext stmtCtx(
+ /*cleanupProhibited=*/true);
+ fir::ExtendedValue initVal = genInitializerExprValue(
+ converter, loc, details->init().value(), stmtCtx);
+ mlir::Value castTo =
+ builder.createConvert(loc, symTy, fir::getBase(initVal));
+ builder.create<fir::HasValueOp>(loc, castTo);
+ });
+ } else if (!global) {
+ global = builder.createGlobal(loc, symTy, globalName, linkage,
+ mlir::Attribute{},
+ /*isConst=*/true,
+ /*isTarget=*/false,
+ /*dataAttr=*/{});
+ Fortran::lower::createGlobalInitialization(
+ builder, global, [&](fir::FirOpBuilder &builder) {
+ Fortran::lower::StatementContext stmtCtx(
+ /*cleanupProhibited=*/true);
+ mlir::Value initVal = genDefaultInitializerValue(
+ converter, loc, sym, symTy, stmtCtx);
+ mlir::Value castTo = builder.createConvert(loc, symTy, initVal);
+ builder.create<fir::HasValueOp>(loc, castTo);
+ });
+ }
+ auto addrOf = builder.create<fir::AddrOfOp>(loc, global.resultType(),
+ global.getSymbol());
+ fir::LoadOp load = builder.create<fir::LoadOp>(loc, addrOf.getResult());
+ // FIXME: Use memcpy instead of store.
+ builder.create<fir::StoreOp>(loc, load, fir::getBase(exv));
+ } else {
+ mlir::Value box = builder.createBox(loc, exv);
+ fir::runtime::genDerivedTypeInitialize(builder, loc, box);
+ }
}
}
diff --git a/flang/test/Lower/HLFIR/structure-constructor.f90
b/flang/test/Lower/HLFIR/structure-constructor.f90
index 3a82145ddf4f6..d881508e7d3ae 100644
--- a/flang/test/Lower/HLFIR/structure-constructor.f90
+++ b/flang/test/Lower/HLFIR/structure-constructor.f90
@@ -98,12 +98,9 @@ end subroutine test3
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}> {bindc_name =
"res", uniq_name = "_QFtest3Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest3Eres"} :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>)
-! CHECK: %[[VAL_4:.*]] = fir.embox %[[VAL_3]]#1 :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
!fir.box<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
-! CHECK: %[[VAL_5:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_6:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.box<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
!fir.box<none>
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_5]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_7]], %[[VAL_8]],
%[[VAL_6]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt3.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFtest3Ex"}
: (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.dscope) ->
(!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>,
!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>)
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
!fir.box<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
@@ -134,12 +131,9 @@ end subroutine test4
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>
{bindc_name = "res", uniq_name = "_QFtest4Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest4Eres"} :
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
-! CHECK: %[[VAL_4:.*]] = fir.embox %[[VAL_3]]#1 :
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
-! CHECK: %[[VAL_5:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_6:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.box<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
-> !fir.box<none>
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_5]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_7]], %[[VAL_8]],
%[[VAL_6]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt4.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
! CHECK: %[[VAL_10:.*]] = arith.constant 2 : index
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_0]] typeparams
%[[VAL_10]] dummy_scope %{{[0-9]+}} {fortran_attrs =
#fir.var_attrs<allocatable>, uniq_name = "_QFtest4Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>, index,
!fir.dscope) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>)
! CHECK: %[[VAL_12:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
@@ -178,12 +172,9 @@ end subroutine test5
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>
{bindc_name = "res", uniq_name = "_QFtest5Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest5Eres"} :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
-! CHECK: %[[VAL_4:.*]] = fir.embox %[[VAL_3]]#1 :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
-! CHECK: %[[VAL_5:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_6:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.box<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
-> !fir.box<none>
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_5]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_7]], %[[VAL_8]],
%[[VAL_6]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt5.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name =
"_QFtest5Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.dscope) ->
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>)
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
@@ -229,12 +220,9 @@ end subroutine test6
! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_8]] typeparams
%[[VAL_9]] dummy_scope %{{[0-9]+}} {uniq_name = "_QFtest6Ec"} :
(!fir.ref<!fir.char<1,4>>, index, !fir.dscope) -> (!fir.ref<!fir.char<1,4>>,
!fir.ref<!fir.char<1,4>>)
! CHECK: %[[VAL_11:.*]] = fir.alloca
!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>
{bindc_name = "res", uniq_name = "_QFtest6Eres"}
! CHECK: %[[VAL_12:.*]]:2 = hlfir.declare %[[VAL_11]] {uniq_name =
"_QFtest6Eres"} :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>,
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
-! CHECK: %[[VAL_13:.*]] = fir.embox %[[VAL_12]]#1 :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
!fir.box<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
-! CHECK: %[[VAL_14:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_15:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_16:.*]] = fir.convert %[[VAL_13]] :
(!fir.box<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
-> !fir.box<none>
-! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_14]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_16]], %[[VAL_17]],
%[[VAL_15]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt6.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_12]]#1 :
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
! CHECK: %[[VAL_19:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name =
"_QFtest6Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.dscope) ->
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>)
! CHECK: %[[VAL_20:.*]]:2 = hlfir.declare %[[VAL_6]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>,
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
! CHECK: %[[VAL_21:.*]] = fir.embox %[[VAL_20]]#0 :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
!fir.box<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
@@ -318,12 +306,9 @@ end subroutine test7
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name =
"_QFtest7En"} : (!fir.ref<i32>, !fir.dscope) -> (!fir.ref<i32>, !fir.ref<i32>)
! CHECK: %[[VAL_3:.*]] = fir.alloca
!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "x", uniq_name = "_QFtest7Ex"}
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %[[VAL_3]] {uniq_name =
"_QFtest7Ex"} :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
-! CHECK: %[[VAL_5:.*]] = fir.embox %[[VAL_4]]#1 :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: %[[VAL_6:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_7:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_5]] :
(!fir.box<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
-> !fir.box<none>
-! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_6]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_8]], %[[VAL_9]],
%[[VAL_7]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt7.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_4]]#1 :
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_13:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
@@ -350,12 +335,9 @@ end subroutine test8
! CHECK: %[[VAL_0:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}> {bindc_name =
"res", uniq_name = "_QFtest8Eres"}
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"_QFtest8Eres"} :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>)
-! CHECK: %[[VAL_3:.*]] = fir.embox %[[VAL_2]]#1 :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
!fir.box<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_5:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_3]] :
(!fir.box<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
!fir.box<none>
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_6]], %[[VAL_7]],
%[[VAL_5]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt8.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_2]]#1 :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
! CHECK: %[[VAL_9:.*]] = fir.alloca
!fir.box<!fir.heap<!fir.char<1,12>>> {bindc_name = "x", uniq_name =
"_QFtest8Ex"}
! CHECK: %[[VAL_10:.*]] = arith.constant 12 : index
! CHECK: %[[VAL_11:.*]] = fir.zero_bits !fir.heap<!fir.char<1,12>>
@@ -399,12 +381,9 @@ end subroutine test9
! CHECK: %[[VAL_0:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}> {bindc_name =
"res", uniq_name = "_QFtest9Eres"}
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"_QFtest9Eres"} :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>)
-! CHECK: %[[VAL_3:.*]] = fir.embox %[[VAL_2]]#1 :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
!fir.box<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_5:.*]] = arith.constant {{[0-9]*}} : i32
-! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_3]] :
(!fir.box<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
!fir.box<none>
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_6]], %[[VAL_7]],
%[[VAL_5]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt8.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_2]]#1 :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
! CHECK: %[[VAL_9:.*]] = arith.constant 12 : index
! CHECK: %[[VAL_10:.*]] = fir.alloca !fir.char<1,12> {bindc_name =
"x", uniq_name = "_QFtest9Ex"}
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_10]] typeparams
%[[VAL_9]] {uniq_name = "_QFtest9Ex"} : (!fir.ref<!fir.char<1,12>>, index) ->
(!fir.ref<!fir.char<1,12>>, !fir.ref<!fir.char<1,12>>)
diff --git a/flang/test/Lower/OpenMP/private-derived-type.f90
b/flang/test/Lower/OpenMP/private-derived-type.f90
index 91d8fa753f2ec..e7e1e707a52b6 100644
--- a/flang/test/Lower/OpenMP/private-derived-type.f90
+++ b/flang/test/Lower/OpenMP/private-derived-type.f90
@@ -27,18 +27,15 @@ end subroutine s4
! CHECK-LABEL: func.func @_QPs4() {
! Example of how the lowering for regular derived type
variables:
-! CHECK: %[[VAL_8:.*]] = fir.alloca
!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}> {bindc_name = "v", uniq_name =
"_QFs4Ev"}
-! CHECK: %[[VAL_9:.*]]:2 = hlfir.declare %[[VAL_8]] {uniq_name =
"_QFs4Ev"} : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) ->
(!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>,
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>)
-! CHECK: %[[VAL_10:.*]] = fir.embox %[[VAL_9]]#1 :
(!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) ->
!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
-! CHECK: %[[VAL_11:.*]] = fir.address_of
-! CHECK: %[[VAL_12:.*]] = arith.constant 4 : i32
-! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_10]] :
(!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
-! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_11]] :
(!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_13]], %[[VAL_14]],
%[[VAL_12]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[VAL_DERIVED_ALLOCA:.*]] = fir.alloca
!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}> {bindc_name = "v", uniq_name =
"_QFs4Ev"}
+! CHECK: %[[VAL_DERIVED_DECLARE:.*]]:2 = hlfir.declare
%[[VAL_DERIVED_ALLOCA]] {{.*}}
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QFs4Ty3.DerivedInit) :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] {{.*}}
+! CHECK: fir.store %[[LOAD]] to %[[VAL_DERIVED_DECLARE]]#1 :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
! CHECK: omp.parallel {
! CHECK: omp.wsloop private(@[[DERIVED_PRIV]] %{{.*}}#0 ->
%{{.*}}, @{{.*}} %{{.*}}#0 -> %{{.*}} :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>, !fir.ref<i32>) {
! CHECK: }
-! CHECK: %[[VAL_39:.*]] = fir.embox %[[VAL_9]]#1 :
(!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) ->
!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
+! CHECK: %[[VAL_39:.*]] = fir.embox %[[VAL_DERIVED_DECLARE]]#1 :
(!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) ->
!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] :
(!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
! Check the derived type is destroyed
! CHECK: fir.call @_FortranADestroy(%[[VAL_40]]) fastmath<contract>
: (!fir.box<none>) -> ()
diff --git a/flang/test/Lower/default-initialization.f90
b/flang/test/Lower/default-initialization.f90
index a3a36d5a1c3de..d3664c1cc04f2 100644
--- a/flang/test/Lower/default-initialization.f90
+++ b/flang/test/Lower/default-initialization.f90
@@ -21,10 +21,10 @@ module test_dinit
! Test local scalar is default initialized
! CHECK-LABEL: func @_QMtest_dinitPlocal()
subroutine local
- ! CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTt{i:i32}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ !CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
{bindc_name = "x", uniq_name = "_QMtest_dinitFlocalEx"}
+ !CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t) :: x
print *, x%i
end subroutine
@@ -45,20 +45,20 @@ subroutine local_array()
! scalars.
! CHECK-LABEL: func @_QMtest_dinitPlocal_alloc_comp()
subroutine local_alloc_comp
- ! CHECK: %[[x:.*]] = fir.alloca
!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
!fir.box<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ !CHECK: %[[x:.*]] = fir.alloca
!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "x", uniq_name = "_QMtest_dinitFlocal_alloc_compEx"}
+ !CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QMtest_dinitTt_alloc_comp.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+ !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+ !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
type(t_alloc_comp) :: x
end subroutine
! Test function results are default initialized.
! CHECK-LABEL: func @_QMtest_dinitPresult() ->
!fir.type<_QMtest_dinitTt{i:i32}>
function result()
- ! CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTt{i:i32}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ !CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
{bindc_name = "result", uniq_name = "_QMtest_dinitFresultEresult"}
+ !CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t) :: result
end function
@@ -66,9 +66,9 @@ function result()
! CHECK-LABEL: func @_QMtest_dinitPintent_out(
! CHECK-SAME: %[[x:.*]]: !fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
subroutine intent_out(x)
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTt{i:i32}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ !CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t), intent(out) :: x
end subroutine
@@ -94,9 +94,9 @@ subroutine local_eq()
! CHECK: %[[equiv:.*]] = fir.alloca !fir.array<4xi8>
! CHECK: %[[xcoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[x:.*]] = fir.convert %[[xcoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ ! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
equivalence (x, zi)
print *, i
end subroutine
@@ -112,16 +112,16 @@ subroutine local_eq2()
! CHECK: %[[equiv:.*]] = fir.alloca !fir.array<4xi8>
! CHECK: %[[xcoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[x:.*]] = fir.convert %[[xcoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[xbox:.*]] = fir.embox %[[x]] :
(!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[xboxNone:.*]] = fir.convert %[[xbox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[xboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ ! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
! CHECK: %[[ycoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[y:.*]] = fir.convert %[[ycoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[ybox:.*]] = fir.embox %[[y]] :
(!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>) ->
!fir.box<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[yboxNone:.*]] = fir.convert %[[ybox]]
- ! CHECK: fir.call @_FortranAInitialize(%[[yboxNone]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+ ! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.store %[[LOAD]] to %[[y]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
equivalence (x, y)
print *, y%i
end subroutine
diff --git a/flang/test/Lower/derived-type-finalization.f90
b/flang/test/Lower/derived-type-finalization.f90
index 66735a9056544..0be9b91cdc0eb 100644
--- a/flang/test/Lower/derived-type-finalization.f90
+++ b/flang/test/Lower/derived-type-finalization.f90
@@ -97,7 +97,9 @@ subroutine test_target_finalization()
! CHECK-LABEL: func.func
@_QMderived_type_finalizationPtest_target_finalization() {
! CHECK: %[[P:.*]] = fir.alloca
!fir.box<!fir.ptr<!fir.type<_QMderived_type_finalizationTt1{a:i32}>>>
{bindc_name = "p", uniq_name =
"_QMderived_type_finalizationFtest_target_finalizationEp"}
-! CHECK: fir.call @_FortranAInitialize
+! CHECK: %[[ADDR:.*]] = fir.alloca
!fir.ptr<!fir.type<_QMderived_type_finalizationTt1{a:i32}>> {uniq_name =
"_QMderived_type_finalizationFtest_target_finalizationEp.addr"}
+! CHECK: %[[zero:.*]] = fir.zero_bits
!fir.ptr<!fir.type<_QMderived_type_finalizationTt1{a:i32}>>
+! CHECK: fir.store %[[zero]] to %[[ADDR]] :
!fir.ref<!fir.ptr<!fir.type<_QMderived_type_finalizationTt1{a:i32}>>>
! CHECK: fir.call @_FortranAPointerAllocateSource
! CHECK: %[[P_BOX_NONE:.*]] = fir.convert %[[P]] :
(!fir.ref<!fir.box<!fir.ptr<!fir.type<_QMderived_type_finalizationTt1{a:i32}>>>>)
-> !fir.ref<!fir.box<none>>
! CHECK: %{{.*}} = fir.call @_FortranAPointerDeallocate(%[[P_BOX_NONE]],
%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) {{.*}} : (!fir.ref<!fir.box<none>>, i1,
!fir.box<none>, !fir.ref<i8>, i32) -> i32
@@ -199,7 +201,10 @@ subroutine test_avoid_double_finalization(a)
end subroutine
! CHECK-LABEL: func.func
@_QMderived_type_finalizationPtest_avoid_double_finalization(
-! CHECK: fir.call @_FortranAInitialize(
+! CHECK: %[[b:.*]] = fir.alloca
!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>
{bindc_name = "b", uniq_name =
"_QMderived_type_finalizationFtest_avoid_double_finalizationEb"}
+! CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QMderived_type_finalizationTt3.DerivedInit) :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
+! CHECK: fir.store %[[LOAD]] to %[[b]] :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
! CHECK-NOT: fir.call @_FortranADestroy
! CHECK: fir.call @_FortranAAssign(
! CHECK: fir.call @_FortranADestroy(
diff --git a/flang/test/Lower/derived-type-temp.f90
b/flang/test/Lower/derived-type-temp.f90
index 4f1d4f2d51cf5..d7b8ce3973295 100644
--- a/flang/test/Lower/derived-type-temp.f90
+++ b/flang/test/Lower/derived-type-temp.f90
@@ -13,7 +13,7 @@ program derived_temp_init
y = t2(x)
end
-! CHECK: %[[temp:.*]] = fir.alloca
!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}> {bindc_name = "x", uniq_name =
"_QFEx"}
-! CHECK: %[[box:.*]] = fir.embox %[[temp]] :
(!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>) ->
!fir.box<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
-! CHECK: %[[box_none:.*]] = fir.convert %[[box]] :
(!fir.box<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
-! CHECK: fir.call @_FortranAInitialize(%[[box_none]], %{{.*}}, %{{.*}})
{{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[x:.*]] = fir.alloca !fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>
{bindc_name = "x", uniq_name = "_QFEx"}
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QFTt1.DerivedInit) :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
diff --git a/flang/test/Lower/forall/forall-allocatable-2.f90
b/flang/test/Lower/forall/forall-allocatable-2.f90
index 67a0018f9a22b..fb212c085dcff 100644
--- a/flang/test/Lower/forall/forall-allocatable-2.f90
+++ b/flang/test/Lower/forall/forall-allocatable-2.f90
@@ -18,12 +18,9 @@ end subroutine forall_with_allocatable2
! CHECK-SAME: %[[VAL_0:.*]]:
!fir.box<!fir.array<?xf32>>{{.*}}) {
! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name
= "i"}
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "thing", uniq_name = "_QFforall_with_allocatable2Ething"}
-! CHECK: %[[VAL_3:.*]] = fir.embox %[[VAL_2]] :
(!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
!fir.box<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,
-! CHECK: %[[VAL_5:.*]] = arith.constant {{.*}} : i32
-! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_3]] :
(!fir.box<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
-> !fir.box<none>
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_4]] :
(!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAInitialize(%[[VAL_6]], %[[VAL_7]],
%[[VAL_5]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QFforall_with_allocatable2Tt.DerivedInit) :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[VAL_2]] :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_9:.*]] = arith.constant 5 : i32
! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> index
! CHECK: %[[VAL_11:.*]] = arith.constant 15 : i32
diff --git a/flang/test/Lower/pointer-default-init.f90
b/flang/test/Lower/pointer-default-init.f90
index 0fb42683a3486..661db22b2eaa2 100644
--- a/flang/test/Lower/pointer-default-init.f90
+++ b/flang/test/Lower/pointer-default-init.f90
@@ -38,7 +38,10 @@ subroutine test_local()
type(t) :: x
end subroutine
! CHECK-LABEL: func.func @_QPtest_local() {
-! CHECK: fir.call @_FortranAInitialize(
+! CHECK: %[[x:.*]] = fir.alloca
!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}> {bindc_name
= "x", uniq_name = "_QFtest_localEx"}
+! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtestTt.DerivedInit) :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
subroutine test_saved()
use test, only : t
>From a3c1526c103becec34bb57667344c518838919c1 Mon Sep 17 00:00:00 2001
From: Jean Perier <jper...@nvidia.com>
Date: Fri, 7 Mar 2025 06:29:36 -0800
Subject: [PATCH 2/2] use fir.copy instead of aggregate load/store
---
flang/lib/Lower/ConvertVariable.cpp | 5 ++---
.../Lower/HLFIR/structure-constructor.f90 | 21 +++++++------------
.../Lower/OpenMP/private-derived-type.f90 | 3 +--
flang/test/Lower/default-initialization.f90 | 21 +++++++------------
.../test/Lower/derived-type-finalization.f90 | 3 +--
flang/test/Lower/derived-type-temp.f90 | 8 +++----
.../Lower/forall/forall-allocatable-2.f90 | 3 +--
flang/test/Lower/pointer-default-init.f90 | 3 +--
8 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/flang/lib/Lower/ConvertVariable.cpp
b/flang/lib/Lower/ConvertVariable.cpp
index 8a7be19f8040b..b11251ecabf05 100644
--- a/flang/lib/Lower/ConvertVariable.cpp
+++ b/flang/lib/Lower/ConvertVariable.cpp
@@ -852,9 +852,8 @@ void Fortran::lower::defaultInitializeAtRuntime(
}
auto addrOf = builder.create<fir::AddrOfOp>(loc, global.resultType(),
global.getSymbol());
- fir::LoadOp load = builder.create<fir::LoadOp>(loc, addrOf.getResult());
- // FIXME: Use memcpy instead of store.
- builder.create<fir::StoreOp>(loc, load, fir::getBase(exv));
+ builder.create<fir::CopyOp>(loc, addrOf, fir::getBase(exv),
+ /*noOverlap=*/true);
} else {
mlir::Value box = builder.createBox(loc, exv);
fir::runtime::genDerivedTypeInitialize(builder, loc, box);
diff --git a/flang/test/Lower/HLFIR/structure-constructor.f90
b/flang/test/Lower/HLFIR/structure-constructor.f90
index d881508e7d3ae..628d3ee0dd771 100644
--- a/flang/test/Lower/HLFIR/structure-constructor.f90
+++ b/flang/test/Lower/HLFIR/structure-constructor.f90
@@ -99,8 +99,7 @@ end subroutine test3
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}> {bindc_name =
"res", uniq_name = "_QFtest3Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest3Eres"} :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt3.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_3]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFtest3Ex"}
: (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>, !fir.dscope) ->
(!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>,
!fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>)
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>) ->
!fir.box<!fir.type<_QMtypesTt3{r:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
@@ -132,8 +131,7 @@ end subroutine test4
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>
{bindc_name = "res", uniq_name = "_QFtest4Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest4Eres"} :
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt4.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_3]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>
! CHECK: %[[VAL_10:.*]] = arith.constant 2 : index
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_0]] typeparams
%[[VAL_10]] dummy_scope %{{[0-9]+}} {fortran_attrs =
#fir.var_attrs<allocatable>, uniq_name = "_QFtest4Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>, index,
!fir.dscope) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>>)
! CHECK: %[[VAL_12:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>)
@@ -173,8 +171,7 @@ end subroutine test5
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>
{bindc_name = "res", uniq_name = "_QFtest5Eres"}
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]] {uniq_name =
"_QFtest5Eres"} :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt5.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_3]]#1 :
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_3]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name =
"_QFtest5Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.dscope) ->
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>)
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>,
!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>>
@@ -221,8 +218,7 @@ end subroutine test6
! CHECK: %[[VAL_11:.*]] = fir.alloca
!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>
{bindc_name = "res", uniq_name = "_QFtest6Eres"}
! CHECK: %[[VAL_12:.*]]:2 = hlfir.declare %[[VAL_11]] {uniq_name =
"_QFtest6Eres"} :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>,
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt6.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_12]]#1 :
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_12]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>,
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
! CHECK: %[[VAL_19:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope
%{{[0-9]+}} {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name =
"_QFtest6Ex"} :
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.dscope) ->
(!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>,
!fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>>)
! CHECK: %[[VAL_20:.*]]:2 = hlfir.declare %[[VAL_6]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>,
!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
! CHECK: %[[VAL_21:.*]] = fir.embox %[[VAL_20]]#0 :
(!fir.ref<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>)
->
!fir.box<!fir.type<_QMtypesTt6{t5:!fir.type<_QMtypesTt5{t5m:!fir.box<!fir.heap<!fir.array<?x!fir.type<_QMtypesTt4{c:!fir.box<!fir.heap<!fir.array<?x!fir.char<1,2>>>>}>>>>}>,t6m:!fir.array<1x!fir.type<_QMtypesTt1{c:!fir.char<1,4>}>>}>>
@@ -307,8 +303,7 @@ end subroutine test7
! CHECK: %[[VAL_3:.*]] = fir.alloca
!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "x", uniq_name = "_QFtest7Ex"}
! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %[[VAL_3]] {uniq_name =
"_QFtest7Ex"} :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt7.DerivedInit)
:
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_4]]#1 :
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_4]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"ctor.temp"} :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_11]]#0 :
(!fir.ref<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
->
!fir.box<!fir.type<_QMtypesTt7{c1:i32,c2:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_13:.*]] = fir.address_of(@_QQclX{{.*}}) :
!fir.ref<!fir.char<1,{{[0-9]*}}>>
@@ -336,8 +331,7 @@ end subroutine test8
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}> {bindc_name =
"res", uniq_name = "_QFtest8Eres"}
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"_QFtest8Eres"} :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt8.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_2]]#1 :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_2]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
! CHECK: %[[VAL_9:.*]] = fir.alloca
!fir.box<!fir.heap<!fir.char<1,12>>> {bindc_name = "x", uniq_name =
"_QFtest8Ex"}
! CHECK: %[[VAL_10:.*]] = arith.constant 12 : index
! CHECK: %[[VAL_11:.*]] = fir.zero_bits !fir.heap<!fir.char<1,12>>
@@ -382,8 +376,7 @@ end subroutine test9
! CHECK: %[[VAL_1:.*]] = fir.alloca
!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}> {bindc_name =
"res", uniq_name = "_QFtest9Eres"}
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_1]] {uniq_name =
"_QFtest9Eres"} :
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>) ->
(!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>)
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtypesTt8.DerivedInit)
: !fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_2]]#1 :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_2]]#1 no_overlap :
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>,
!fir.ref<!fir.type<_QMtypesTt8{c:!fir.box<!fir.heap<!fir.char<1,11>>>}>>
! CHECK: %[[VAL_9:.*]] = arith.constant 12 : index
! CHECK: %[[VAL_10:.*]] = fir.alloca !fir.char<1,12> {bindc_name =
"x", uniq_name = "_QFtest9Ex"}
! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_10]] typeparams
%[[VAL_9]] {uniq_name = "_QFtest9Ex"} : (!fir.ref<!fir.char<1,12>>, index) ->
(!fir.ref<!fir.char<1,12>>, !fir.ref<!fir.char<1,12>>)
diff --git a/flang/test/Lower/OpenMP/private-derived-type.f90
b/flang/test/Lower/OpenMP/private-derived-type.f90
index e7e1e707a52b6..e188672d60bd6 100644
--- a/flang/test/Lower/OpenMP/private-derived-type.f90
+++ b/flang/test/Lower/OpenMP/private-derived-type.f90
@@ -30,8 +30,7 @@ end subroutine s4
! CHECK: %[[VAL_DERIVED_ALLOCA:.*]] = fir.alloca
!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}> {bindc_name = "v", uniq_name =
"_QFs4Ev"}
! CHECK: %[[VAL_DERIVED_DECLARE:.*]]:2 = hlfir.declare
%[[VAL_DERIVED_ALLOCA]] {{.*}}
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QFs4Ty3.DerivedInit) :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] {{.*}}
-! CHECK: fir.store %[[LOAD]] to %[[VAL_DERIVED_DECLARE]]#1 :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_DERIVED_DECLARE]]#1 no_overlap
: {{.*}}
! CHECK: omp.parallel {
! CHECK: omp.wsloop private(@[[DERIVED_PRIV]] %{{.*}}#0 ->
%{{.*}}, @{{.*}} %{{.*}}#0 -> %{{.*}} :
!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>, !fir.ref<i32>) {
! CHECK: }
diff --git a/flang/test/Lower/default-initialization.f90
b/flang/test/Lower/default-initialization.f90
index d3664c1cc04f2..7b93db43613f1 100644
--- a/flang/test/Lower/default-initialization.f90
+++ b/flang/test/Lower/default-initialization.f90
@@ -23,8 +23,7 @@ module test_dinit
subroutine local
!CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
{bindc_name = "x", uniq_name = "_QMtest_dinitFlocalEx"}
!CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>,
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t) :: x
print *, x%i
end subroutine
@@ -47,8 +46,7 @@ subroutine local_array()
subroutine local_alloc_comp
!CHECK: %[[x:.*]] = fir.alloca
!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "x", uniq_name = "_QMtest_dinitFlocal_alloc_compEx"}
!CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QMtest_dinitTt_alloc_comp.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
- !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
- !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+ !CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtest_dinitTt_alloc_comp{i:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
type(t_alloc_comp) :: x
end subroutine
@@ -57,8 +55,7 @@ subroutine local_alloc_comp
function result()
!CHECK: %[[x:.*]] = fir.alloca !fir.type<_QMtest_dinitTt{i:i32}>
{bindc_name = "result", uniq_name = "_QMtest_dinitFresultEresult"}
!CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>,
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t) :: result
end function
@@ -67,8 +64,7 @@ function result()
! CHECK-SAME: %[[x:.*]]: !fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
subroutine intent_out(x)
!CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTt.DerivedInit) :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
- !CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
+ !CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>,
!fir.ref<!fir.type<_QMtest_dinitTt{i:i32}>>
type(t), intent(out) :: x
end subroutine
@@ -95,8 +91,7 @@ subroutine local_eq()
! CHECK: %[[xcoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[x:.*]] = fir.convert %[[xcoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>,
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
equivalence (x, zi)
print *, i
end subroutine
@@ -113,15 +108,13 @@ subroutine local_eq2()
! CHECK: %[[xcoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[x:.*]] = fir.convert %[[xcoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>,
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
! CHECK: %[[ycoor:.*]] = fir.coordinate_of %[[equiv]], %c0{{.*}} :
(!fir.ref<!fir.array<4xi8>>, index) -> !fir.ref<i8>
! CHECK: %[[y:.*]] = fir.convert %[[ycoor]] : (!fir.ref<i8>) ->
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtest_dinitTtseq.DerivedInit)
: !fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>
- ! CHECK: fir.store %[[LOAD]] to %[[y]] :
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
+ ! CHECK: fir.copy %[[ADDR]] to %[[y]] no_overlap :
!fir.ref<!fir.type<_QMtest_dinitTtseq{i:i32}>>,
!fir.ptr<!fir.type<_QMtest_dinitTtseq{i:i32}>>
equivalence (x, y)
print *, y%i
end subroutine
diff --git a/flang/test/Lower/derived-type-finalization.f90
b/flang/test/Lower/derived-type-finalization.f90
index 0be9b91cdc0eb..3ea58cd719f4a 100644
--- a/flang/test/Lower/derived-type-finalization.f90
+++ b/flang/test/Lower/derived-type-finalization.f90
@@ -203,8 +203,7 @@ subroutine test_avoid_double_finalization(a)
! CHECK-LABEL: func.func
@_QMderived_type_finalizationPtest_avoid_double_finalization(
! CHECK: %[[b:.*]] = fir.alloca
!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>
{bindc_name = "b", uniq_name =
"_QMderived_type_finalizationFtest_avoid_double_finalizationEb"}
! CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QMderived_type_finalizationTt3.DerivedInit) :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
-! CHECK: fir.store %[[LOAD]] to %[[b]] :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[b]] no_overlap :
!fir.ref<!fir.type<_QMderived_type_finalizationTt3{t:!fir.type<_QMderived_type_finalizationTt2{a:!fir.box<!fir.heap<!fir.array<?xi32>>>}>}>>
! CHECK-NOT: fir.call @_FortranADestroy
! CHECK: fir.call @_FortranAAssign(
! CHECK: fir.call @_FortranADestroy(
diff --git a/flang/test/Lower/derived-type-temp.f90
b/flang/test/Lower/derived-type-temp.f90
index d7b8ce3973295..f4e55fe095c6d 100644
--- a/flang/test/Lower/derived-type-temp.f90
+++ b/flang/test/Lower/derived-type-temp.f90
@@ -1,5 +1,5 @@
! Test lowering of derived type temporary creation and init
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
program derived_temp_init
type t1
@@ -13,7 +13,7 @@ program derived_temp_init
y = t2(x)
end
-! CHECK: %[[x:.*]] = fir.alloca !fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>
{bindc_name = "x", uniq_name = "_QFEx"}
+! CHECK: %[[ALLOC:.*]] = fir.alloca
!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}> {bindc_name = "x", uniq_name =
"_QFEx"}
+! CHECK: %[[x:.*]]:2 = hlfir.declare %[[ALLOC]] {{.*}}
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QFTt1.DerivedInit) :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[x]]#1 no_overlap :
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>,
!fir.ref<!fir.type<_QFTt1{i:!fir.box<!fir.heap<i32>>}>>
diff --git a/flang/test/Lower/forall/forall-allocatable-2.f90
b/flang/test/Lower/forall/forall-allocatable-2.f90
index fb212c085dcff..16bfc286d9482 100644
--- a/flang/test/Lower/forall/forall-allocatable-2.f90
+++ b/flang/test/Lower/forall/forall-allocatable-2.f90
@@ -19,8 +19,7 @@ end subroutine forall_with_allocatable2
! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name
= "i"}
! CHECK: %[[VAL_2:.*]] = fir.alloca
!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>
{bindc_name = "thing", uniq_name = "_QFforall_with_allocatable2Ething"}
! CHECK: %[[ADDR:.*]] =
fir.address_of(@_QQ_QFforall_with_allocatable2Tt.DerivedInit) :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[VAL_2]] :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[VAL_2]] no_overlap :
!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
! CHECK: %[[VAL_9:.*]] = arith.constant 5 : i32
! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> index
! CHECK: %[[VAL_11:.*]] = arith.constant 15 : i32
diff --git a/flang/test/Lower/pointer-default-init.f90
b/flang/test/Lower/pointer-default-init.f90
index 661db22b2eaa2..dd9c7539b4f05 100644
--- a/flang/test/Lower/pointer-default-init.f90
+++ b/flang/test/Lower/pointer-default-init.f90
@@ -40,8 +40,7 @@ subroutine test_local()
! CHECK-LABEL: func.func @_QPtest_local() {
! CHECK: %[[x:.*]] = fir.alloca
!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}> {bindc_name
= "x", uniq_name = "_QFtest_localEx"}
! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QMtestTt.DerivedInit) :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
-! CHECK: %[[LOAD:.*]] = fir.load %[[ADDR]] :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
-! CHECK: fir.store %[[LOAD]] to %[[x]] :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
+! CHECK: fir.copy %[[ADDR]] to %[[x]] no_overlap :
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>,
!fir.ref<!fir.type<_QMtestTt{i:i32,x:!fir.box<!fir.ptr<!fir.array<?xf32>>>}>>
subroutine test_saved()
use test, only : t
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
