[flang-commits] [flang] [flang][NFC] Converted five tests from old lowering to new lowering (part 4) (PR #174906)
Eugene Epshteyn via flang-commits
flang-commits at lists.llvm.org
Wed Jan 7 19:49:57 PST 2026
https://github.com/eugeneepshteyn created https://github.com/llvm/llvm-project/pull/174906
>From this point on, the conversion is done to HLFIR, not to FIR.
Tests converted in Lower: allocatables.f90, allocate-source-pointers.f90, array-constructor-2.f90, array-elemental-calls-3.f90, array-elemental-calls.f90
>From b2cfcb2d6f4dc59a7a113b3ea48a75db27eecda6 Mon Sep 17 00:00:00 2001
From: Eugene Epshteyn <eepshteyn at nvidia.com>
Date: Wed, 7 Jan 2026 22:46:59 -0500
Subject: [PATCH] [flang][NFC] Converted five tests from old lowering to new
lowering (part 4)
>From this point on, the conversion is done to HLFIR, not to FIR.
Tests converted in Lower: allocatables.f90, allocate-source-pointers.f90,
array-constructor-2.f90, array-elemental-calls-3.f90, array-elemental-calls.f90
---
flang/test/Lower/allocatables.f90 | 112 ++---
flang/test/Lower/allocate-source-pointers.f90 | 390 +++++-------------
flang/test/Lower/array-constructor-2.f90 | 147 +++----
flang/test/Lower/array-elemental-calls-3.f90 | 27 +-
flang/test/Lower/array-elemental-calls.f90 | 78 ++--
5 files changed, 274 insertions(+), 480 deletions(-)
diff --git a/flang/test/Lower/allocatables.f90 b/flang/test/Lower/allocatables.f90
index 60b7de3301c48..2600162eee8c7 100644
--- a/flang/test/Lower/allocatables.f90
+++ b/flang/test/Lower/allocatables.f90
@@ -1,72 +1,76 @@
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
! Test lowering of allocatables using runtime for allocate/deallcoate statements.
! CHECK-LABEL: _QPfooscalar
subroutine fooscalar()
! Test lowering of local allocatable specification
real, allocatable :: x
- ! CHECK: %[[xAddrVar:.*]] = fir.alloca !fir.heap<f32> {{{.*}}uniq_name = "_QFfooscalarEx.addr"}
+ ! CHECK: %[[xAddrVar:.*]] = fir.alloca !fir.box<!fir.heap<f32>> {{{.*}}uniq_name = "_QFfooscalarEx"}
! CHECK: %[[nullAddr:.*]] = fir.zero_bits !fir.heap<f32>
- ! CHECK: fir.store %[[nullAddr]] to %[[xAddrVar]] : !fir.ref<!fir.heap<f32>>
+ ! CHECK: %[[box:.*]] = fir.embox %[[nullAddr]] : (!fir.heap<f32>) -> !fir.box<!fir.heap<f32>>
+ ! CHECK: fir.store %[[box]] to %[[xAddrVar]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+ ! CHECK: %[[decl:.*]]:2 = hlfir.declare %[[xAddrVar]] {{{.*}}uniq_name = "_QFfooscalarEx"} : (!fir.ref<!fir.box<!fir.heap<f32>>>) -> (!fir.ref<!fir.box<!fir.heap<f32>>>, !fir.ref<!fir.box<!fir.heap<f32>>>)
! Test allocation of local allocatables
allocate(x)
! CHECK: %[[alloc:.*]] = fir.allocmem f32 {{{.*}}uniq_name = "_QFfooscalarEx.alloc"}
- ! CHECK: fir.store %[[alloc]] to %[[xAddrVar]] : !fir.ref<!fir.heap<f32>>
+ ! CHECK: %[[box2:.*]] = fir.embox %[[alloc]] : (!fir.heap<f32>) -> !fir.box<!fir.heap<f32>>
+ ! CHECK: fir.store %[[box2]] to %[[decl]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
! Test reading allocatable bounds and extents
print *, x
- ! CHECK: %[[xAddr1:.*]] = fir.load %[[xAddrVar]] : !fir.ref<!fir.heap<f32>>
- ! CHECK: = fir.load %[[xAddr1]] : !fir.heap<f32>
+ ! CHECK: %[[xAddr1:.*]] = fir.load %[[decl]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
+ ! CHECK: %[[addr:.*]] = fir.box_addr %[[xAddr1]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
+ ! CHECK: = fir.load %[[addr]] : !fir.heap<f32>
! Test deallocation
deallocate(x)
- ! CHECK: %[[xAddr2:.*]] = fir.load %[[xAddrVar]] : !fir.ref<!fir.heap<f32>>
- ! CHECK: fir.freemem %[[xAddr2]]
+ ! CHECK: %[[xAddr2:.*]] = fir.load %[[decl]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
+ ! CHECK: %[[addr2:.*]] = fir.box_addr %[[xAddr2]] : (!fir.box<!fir.heap<f32>>) -> !fir.heap<f32>
+ ! CHECK: fir.freemem %[[addr2]]
! CHECK: %[[nullAddr1:.*]] = fir.zero_bits !fir.heap<f32>
- ! fir.store %[[nullAddr1]] to %[[xAddrVar]] : !fir.ref<!fir.heap<f32>>
+ ! CHECK: %[[box3:.*]] = fir.embox %[[nullAddr1]] : (!fir.heap<f32>) -> !fir.box<!fir.heap<f32>>
+ ! fir.store %[[box3]] to %[[decl]]#0 : !fir.ref<!fir.box<!fir.heap<f32>>>
end subroutine
! CHECK-LABEL: _QPfoodim1
subroutine foodim1()
! Test lowering of local allocatable specification
real, allocatable :: x(:)
- ! CHECK-DAG: %[[xAddrVar:.*]] = fir.alloca !fir.heap<!fir.array<?xf32>> {{{.*}}uniq_name = "_QFfoodim1Ex.addr"}
- ! CHECK-DAG: %[[xLbVar:.*]] = fir.alloca index {{{.*}}uniq_name = "_QFfoodim1Ex.lb0"}
- ! CHECK-DAG: %[[xExtVar:.*]] = fir.alloca index {{{.*}}uniq_name = "_QFfoodim1Ex.ext0"}
+ ! CHECK: %[[xAddrVar:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xf32>>> {{{.*}}uniq_name = "_QFfoodim1Ex"}
! CHECK: %[[nullAddr:.*]] = fir.zero_bits !fir.heap<!fir.array<?xf32>>
- ! CHECK: fir.store %[[nullAddr]] to %[[xAddrVar]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
+ ! CHECK: %[[box:.*]] = fir.embox %[[nullAddr]]
+ ! CHECK: fir.store %[[box]] to %[[xAddrVar]]
! Test allocation of local allocatables
allocate(x(42:100))
- ! CHECK-DAG: %[[c42:.*]] = fir.convert %c42{{.*}} : (i32) -> index
- ! CHECK-DAG: %[[c100:.*]] = fir.convert %c100_i32 : (i32) -> index
- ! CHECK-DAG: %[[diff:.*]] = arith.subi %[[c100]], %[[c42]] : index
+ ! CHECK: %[[c42:.*]] = fir.convert %c42{{.*}} : (i32) -> index
+ ! CHECK: %[[c100:.*]] = fir.convert %c100_i32 : (i32) -> index
+ ! CHECK: %[[diff:.*]] = arith.subi %[[c100]], %[[c42]] : index
! CHECK: %[[rawExtent:.*]] = arith.addi %[[diff]], %c1{{.*}} : index
! CHECK: %[[extentPositive:.*]] = arith.cmpi sgt, %[[rawExtent]], %c0{{.*}} : index
! CHECK: %[[extent:.*]] = arith.select %[[extentPositive]], %[[rawExtent]], %c0{{.*}} : index
! CHECK: %[[alloc:.*]] = fir.allocmem !fir.array<?xf32>, %[[extent]] {{{.*}}uniq_name = "_QFfoodim1Ex.alloc"}
- ! CHECK-DAG: fir.store %[[alloc]] to %[[xAddrVar]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
- ! CHECK-DAG: fir.store %[[extent]] to %[[xExtVar]] : !fir.ref<index>
- ! CHECK-DAG: fir.store %[[c42]] to %[[xLbVar]] : !fir.ref<index>
+ ! CHECK: %[[shape:.*]] = fir.shape_shift %[[c42]], %[[extent]]
+ ! CHECK: %[[box2:.*]] = fir.embox %[[alloc]](%[[shape]])
+ ! CHECK: fir.store %[[box2]] to %{{.*}}
! Test reading allocatable bounds and extents
print *, x(42)
- ! CHECK-DAG: fir.load %[[xLbVar]] : !fir.ref<index>
- ! CHECK-DAG: fir.load %[[xAddrVar]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
+ ! CHECK: %[[load:.*]] = fir.load %{{.*}} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+ ! CHECK: hlfir.designate %[[load]] (%c42)
deallocate(x)
- ! CHECK: %[[xAddr1:.*]] = fir.load %{{.*}} : !fir.ref<!fir.heap<!fir.array<?xf32>>>
- ! CHECK: fir.freemem %[[xAddr1]]
- ! CHECK: %[[nullAddr1:.*]] = fir.zero_bits !fir.heap<!fir.array<?xf32>>
- ! CHECK: fir.store %[[nullAddr1]] to %[[xAddrVar]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
+ ! CHECK: %[[load2:.*]] = fir.load %{{.*}} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+ ! CHECK: %[[addr:.*]] = fir.box_addr %[[load2]]
+ ! CHECK: fir.freemem %[[addr]]
end subroutine
! CHECK-LABEL: _QPfoodim2
subroutine foodim2()
! Test lowering of local allocatable specification
real, allocatable :: x(:, :)
- ! CHECK-DAG: fir.alloca !fir.heap<!fir.array<?x?xf32>> {{{.*}}uniq_name = "_QFfoodim2Ex.addr"}
+ ! CHECK: fir.alloca !fir.box<!fir.heap<!fir.array<?x?xf32>>> {{{.*}}uniq_name = "_QFfoodim2Ex"}
end subroutine
! test lowering of character allocatables. Focus is placed on the length handling
@@ -74,35 +78,36 @@ subroutine foodim2()
subroutine char_deferred(n)
integer :: n
character(:), allocatable :: c
- ! CHECK-DAG: %[[cAddrVar:.*]] = fir.alloca !fir.heap<!fir.char<1,?>> {{{.*}}uniq_name = "_QFchar_deferredEc.addr"}
- ! CHECK-DAG: %[[cLenVar:.*]] = fir.alloca index {{{.*}}uniq_name = "_QFchar_deferredEc.len"}
+ ! CHECK: %[[cAddrVar:.*]] = fir.alloca !fir.box<!fir.heap<!fir.char<1,?>>> {{{.*}}uniq_name = "_QFchar_deferredEc"}
allocate(character(10):: c)
! CHECK: %[[c10:.]] = fir.convert %c10_i32 : (i32) -> index
- ! CHECK: fir.allocmem !fir.char<1,?>(%[[c10]] : index) {{{.*}}uniq_name = "_QFchar_deferredEc.alloc"}
- ! CHECK: fir.store %[[c10]] to %[[cLenVar]] : !fir.ref<index>
+ ! CHECK: %[[alloc:.*]] = fir.allocmem !fir.char<1,?>(%[[c10]] : index) {{{.*}}uniq_name = "_QFchar_deferredEc.alloc"}
+ ! CHECK: %[[box:.*]] = fir.embox %[[alloc]] typeparams %[[c10]]
+ ! CHECK: fir.store %[[box]] to %{{.*}}
deallocate(c)
! CHECK: fir.freemem %{{.*}}
allocate(character(n):: c)
- ! CHECK: %[[n:.*]] = fir.load %arg0 : !fir.ref<i32>
+ ! CHECK: %[[n:.*]] = fir.load %{{.*}} : !fir.ref<i32>
! CHECK: %[[nPositive:.*]] = arith.cmpi sgt, %[[n]], %c0{{.*}} : i32
! CHECK: %[[ns:.*]] = arith.select %[[nPositive]], %[[n]], %c0{{.*}} : i32
! CHECK: %[[ni:.*]] = fir.convert %[[ns]] : (i32) -> index
- ! CHECK: fir.allocmem !fir.char<1,?>(%[[ni]] : index) {{{.*}}uniq_name = "_QFchar_deferredEc.alloc"}
- ! CHECK: fir.store %[[ni]] to %[[cLenVar]] : !fir.ref<index>
+ ! CHECK: %[[alloc2:.*]] = fir.allocmem !fir.char<1,?>(%[[ni]] : index)
+ ! CHECK: %[[box2:.*]] = fir.embox %[[alloc2]] typeparams %[[ni]]
+ ! CHECK: fir.store %[[box2]] to %{{.*}}
call bar(c)
- ! CHECK-DAG: %[[cLen:.*]] = fir.load %[[cLenVar]] : !fir.ref<index>
- ! CHECK-DAG: %[[cAddr:.*]] = fir.load %[[cAddrVar]] : !fir.ref<!fir.heap<!fir.char<1,?>>>
- ! CHECK: fir.emboxchar %[[cAddr]], %[[cLen]] : (!fir.heap<!fir.char<1,?>>, index) -> !fir.boxchar<1>
+ ! CHECK: %[[load:.*]] = fir.load %{{.*}} : !fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>
+ ! CHECK: %[[addr:.*]] = fir.box_addr %[[load]]
+ ! CHECK: %[[load2:.*]] = fir.load %{{.*}}
+ ! CHECK: %[[len:.*]] = fir.box_elesize %[[load2]]
+ ! CHECK: fir.emboxchar %[[addr]], %[[len]]
end subroutine
! CHECK-LABEL: _QPchar_explicit_cst(
subroutine char_explicit_cst(n)
integer :: n
character(10), allocatable :: c
- ! CHECK-DAG: %[[cLen:.*]] = arith.constant 10 : index
- ! CHECK-DAG: %[[cAddrVar:.*]] = fir.alloca !fir.heap<!fir.char<1,10>> {{{.*}}uniq_name = "_QFchar_explicit_cstEc.addr"}
- ! CHECK-NOT: "_QFchar_explicit_cstEc.len"
+ ! CHECK: %[[cAddrVar:.*]] = fir.alloca !fir.box<!fir.heap<!fir.char<1,10>>> {{{.*}}uniq_name = "_QFchar_explicit_cstEc"}
allocate(c)
! CHECK: fir.allocmem !fir.char<1,10> {{{.*}}uniq_name = "_QFchar_explicit_cstEc.alloc"}
deallocate(c)
@@ -114,20 +119,21 @@ subroutine char_explicit_cst(n)
allocate(character(10):: c)
! CHECK: fir.allocmem !fir.char<1,10> {{{.*}}uniq_name = "_QFchar_explicit_cstEc.alloc"}
call bar(c)
- ! CHECK: %[[cAddr:.*]] = fir.load %[[cAddrVar]] : !fir.ref<!fir.heap<!fir.char<1,10>>>
- ! CHECK: fir.emboxchar %[[cAddr]], %[[cLen]] : (!fir.heap<!fir.char<1,10>>, index) -> !fir.boxchar<1>
+ ! CHECK: %[[load:.*]] = fir.load %{{.*}}
+ ! CHECK: %[[addr:.*]] = fir.box_addr %[[load]]
+ ! CHECK: %[[cast:.*]] = fir.convert %[[addr]] : (!fir.heap<!fir.char<1,10>>) -> !fir.ref<!fir.char<1,10>>
+ ! CHECK: fir.emboxchar %[[cast]], %c10
end subroutine
! CHECK-LABEL: _QPchar_explicit_dyn(
subroutine char_explicit_dyn(l1, l2)
integer :: l1, l2
character(l1), allocatable :: c
- ! CHECK: %[[l1:.*]] = fir.load %arg0 : !fir.ref<i32>
+ ! CHECK: %[[cAddrVar:.*]] = fir.alloca !fir.box<!fir.heap<!fir.char<1,?>>> {{{.*}}uniq_name = "_QFchar_explicit_dynEc"}
+ ! CHECK: %[[l1:.*]] = fir.load %{{.*}} : !fir.ref<i32>
! CHECK: %[[c0_i32:.*]] = arith.constant 0 : i32
! CHECK: %[[cmp:.*]] = arith.cmpi sgt, %[[l1]], %[[c0_i32]] : i32
! CHECK: %[[cLen:.*]] = arith.select %[[cmp]], %[[l1]], %[[c0_i32]] : i32
- ! CHECK: %[[cAddrVar:.*]] = fir.alloca !fir.heap<!fir.char<1,?>> {{{.*}}uniq_name = "_QFchar_explicit_dynEc.addr"}
- ! CHECK-NOT: "_QFchar_explicit_dynEc.len"
allocate(c)
! CHECK: %[[cLenCast1:.*]] = fir.convert %[[cLen]] : (i32) -> index
! CHECK: fir.allocmem !fir.char<1,?>(%[[cLenCast1]] : index) {{{.*}}uniq_name = "_QFchar_explicit_dynEc.alloc"}
@@ -142,9 +148,9 @@ subroutine char_explicit_dyn(l1, l2)
! CHECK: %[[cLenCast3:.*]] = fir.convert %[[cLen]] : (i32) -> index
! CHECK: fir.allocmem !fir.char<1,?>(%[[cLenCast3]] : index) {{{.*}}uniq_name = "_QFchar_explicit_dynEc.alloc"}
call bar(c)
- ! CHECK-DAG: %[[cLenCast4:.*]] = fir.convert %[[cLen]] : (i32) -> index
- ! CHECK-DAG: %[[cAddr:.*]] = fir.load %[[cAddrVar]] : !fir.ref<!fir.heap<!fir.char<1,?>>>
- ! CHECK: fir.emboxchar %[[cAddr]], %[[cLenCast4]] : (!fir.heap<!fir.char<1,?>>, index) -> !fir.boxchar<1>
+ ! CHECK: %[[load:.*]] = fir.load %{{.*}}
+ ! CHECK: %[[addr:.*]] = fir.box_addr %[[load]]
+ ! CHECK: fir.emboxchar %[[addr]], %[[cLen]]
end subroutine
! CHECK-LABEL: _QPspecifiers(
@@ -155,16 +161,16 @@ subroutine specifiers
character*30 :: mmm = "None"
! CHECK: fir.call @_FortranAAllocatableSetBounds
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableAllocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK: fir.if %{{[0-9]+}} {
! CHECK: fir.call @_FortranAAllocatableSetBounds
! CHECK: fir.call @_FortranAAllocatableSetBounds
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableAllocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK: fir.if %{{[0-9]+}} {
! CHECK: fir.call @_FortranAAllocatableSetBounds
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableAllocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK-NOT: fir.if %{{[0-9]+}} {
! CHECK-COUNT-2: }
! CHECK-NOT: }
@@ -178,13 +184,13 @@ subroutine specifiers
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableAllocate
allocate(jj1(3), jj2(3,3), jj3(3), stat=sss, errmsg=mmm)
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableDeallocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK: fir.if %{{[0-9]+}} {
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableDeallocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK: fir.if %{{[0-9]+}} {
! CHECK: [[RESULT:%[0-9]+]] = fir.call @_FortranAAllocatableDeallocate
- ! CHECK: fir.store [[RESULT]] to [[STAT]]
+ ! CHECK: fir.store [[RESULT]] to %{{.*}}
! CHECK-NOT: fir.if %{{[0-9]+}} {
! CHECK-COUNT-2: }
! CHECK-NOT: }
diff --git a/flang/test/Lower/allocate-source-pointers.f90 b/flang/test/Lower/allocate-source-pointers.f90
index 7e6ef0c049c06..0a144e494fbb1 100644
--- a/flang/test/Lower/allocate-source-pointers.f90
+++ b/flang/test/Lower/allocate-source-pointers.f90
@@ -1,20 +1,23 @@
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
! Test lowering of pointers for allocate statements with source.
! CHECK-LABEL: func.func @_QPtest_pointer_scalar(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<f32> {fir.bindc_name = "a"}) {
-! CHECK: %[[VAL_1:.*]] = fir.address_of(@_QFtest_pointer_scalarEx1) : !fir.ref<!fir.box<!fir.ptr<f32>>>
-! CHECK: %[[VAL_2:.*]] = fir.address_of(@_QFtest_pointer_scalarEx2) : !fir.ref<!fir.box<!fir.ptr<f32>>>
-! CHECK: %[[VAL_3:.*]] = arith.constant false
-! CHECK: %[[VAL_4:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_7:.*]] = fir.embox %[[VAL_0]] : (!fir.ref<f32>) -> !fir.box<f32>
-! CHECK: %[[VAL_8:.*]] = fir.zero_bits !fir.ptr<f32>
-! CHECK: %[[VAL_9:.*]] = fir.embox %[[VAL_8]] : (!fir.ptr<f32>) -> !fir.box<!fir.ptr<f32>>
-! CHECK: fir.store %[[VAL_9]] to %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<f32>>>
-! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<!fir.box<!fir.ptr<f32>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_7]] : (!fir.box<f32>) -> !fir.box<none>
-! CHECK: %[[VAL_13:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_10]], %[[VAL_11]], %[[VAL_3]], %[[VAL_4]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<f32>
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[ADDR_X1:.*]] = fir.address_of(@_QFtest_pointer_scalarEx1)
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[ADDR_X1]]
+! CHECK: %[[ADDR_X2:.*]] = fir.address_of(@_QFtest_pointer_scalarEx2)
+! CHECK: %[[DECL_X2:.*]]:2 = hlfir.declare %[[ADDR_X2]]
+! CHECK: %[[FALSE:.*]] = arith.constant false
+! CHECK: %[[ABSENT:.*]] = fir.absent !fir.box<none>
+! CHECK: %[[BOX_A:.*]] = fir.embox %[[DECL_A]]#0
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %[[FALSE]], %[[ABSENT]], %{{.*}}, %{{.*}})
+! CHECK: %[[BOX_X2:.*]] = fir.convert %[[DECL_X2]]#0
+! CHECK: %[[BOX_SOURCE_2:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X2]], %[[BOX_SOURCE_2]], %[[FALSE]], %[[ABSENT]], %{{.*}}, %{{.*}})
subroutine test_pointer_scalar(a)
real, save, pointer :: x1, x2
@@ -24,67 +27,32 @@ subroutine test_pointer_scalar(a)
end
! CHECK-LABEL: func.func @_QPtest_pointer_2d_array(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<i32> {fir.bindc_name = "n"},
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<?x?xi32>> {fir.bindc_name = "a"}) {
-! CHECK: %[[VAL_2:.*]] = fir.alloca i32 {bindc_name = "sss", uniq_name = "_QFtest_pointer_2d_arrayEsss"}
-! CHECK: %[[VAL_3:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {bindc_name = "x1", uniq_name = "_QFtest_pointer_2d_arrayEx1"}
-! CHECK: %[[VAL_4:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x?xi32>>
-! CHECK: %[[VAL_5:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_6:.*]] = fir.shape %[[VAL_5]], %[[VAL_5]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_7:.*]] = fir.embox %[[VAL_4]](%[[VAL_6]]) : (!fir.ptr<!fir.array<?x?xi32>>, !fir.shape<2>) -> !fir.box<!fir.ptr<!fir.array<?x?xi32>>>
-! CHECK: fir.store %[[VAL_7]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x?xi32>>>>
-! CHECK: %[[VAL_8:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {bindc_name = "x2", uniq_name = "_QFtest_pointer_2d_arrayEx2"}
-! CHECK: %[[VAL_13:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {bindc_name = "x3", uniq_name = "_QFtest_pointer_2d_arrayEx3"}
-! CHECK: %[[VAL_18:.*]] = fir.load %[[VAL_0]] : !fir.ref<i32>
-! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_18]] : (i32) -> i64
-! CHECK: %[[VAL_20:.*]] = fir.convert %[[VAL_19]] : (i64) -> index
-! CHECK: %[[VAL_21:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_22:.*]] = arith.cmpi sgt, %[[VAL_20]], %[[VAL_21]] : index
-! CHECK: %[[VAL_23:.*]] = arith.select %[[VAL_22]], %[[VAL_20]], %[[VAL_21]] : index
-! CHECK: %[[VAL_24:.*]] = fir.load %[[VAL_0]] : !fir.ref<i32>
-! CHECK: %[[VAL_25:.*]] = fir.convert %[[VAL_24]] : (i32) -> i64
-! CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_25]] : (i64) -> index
-! CHECK: %[[VAL_27:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_28:.*]] = arith.cmpi sgt, %[[VAL_26]], %[[VAL_27]] : index
-! CHECK: %[[VAL_29:.*]] = arith.select %[[VAL_28]], %[[VAL_26]], %[[VAL_27]] : index
-! CHECK: %[[VAL_30:.*]] = arith.constant false
-! CHECK: %[[VAL_31:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_34:.*]] = fir.shape %[[VAL_23]], %[[VAL_29]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_35:.*]] = fir.embox %[[VAL_1]](%[[VAL_34]]) : (!fir.ref<!fir.array<?x?xi32>>, !fir.shape<2>) -> !fir.box<!fir.array<?x?xi32>>
-! CHECK: %[[VAL_36:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x?xi32>>
-! CHECK: %[[VAL_37:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_38:.*]] = fir.shape %[[VAL_37]], %[[VAL_37]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_39:.*]] = fir.embox %[[VAL_36]](%[[VAL_38]]) : (!fir.ptr<!fir.array<?x?xi32>>, !fir.shape<2>) -> !fir.box<!fir.ptr<!fir.array<?x?xi32>>>
-! CHECK: fir.store %[[VAL_39]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x?xi32>>>>
-! CHECK: %[[VAL_40:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_41:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_42:.*]]:3 = fir.box_dims %[[VAL_35]], %[[VAL_41]] : (!fir.box<!fir.array<?x?xi32>>, index) -> (index, index, index)
-! CHECK: %[[VAL_43:.*]] = arith.addi %[[VAL_42]]#1, %[[VAL_40]] : index
-! CHECK: %[[VAL_44:.*]] = arith.subi %[[VAL_43]], %[[VAL_40]] : index
-! CHECK: %[[VAL_45:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_46:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_47:.*]] = fir.convert %[[VAL_40]] : (index) -> i64
-! CHECK: %[[VAL_48:.*]] = fir.convert %[[VAL_44]] : (index) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_46]], %[[VAL_45]], %[[VAL_47]], %[[VAL_48]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_50:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_51:.*]]:3 = fir.box_dims %[[VAL_35]], %[[VAL_50]] : (!fir.box<!fir.array<?x?xi32>>, index) -> (index, index, index)
-! CHECK: %[[VAL_52:.*]] = arith.addi %[[VAL_51]]#1, %[[VAL_40]] : index
-! CHECK: %[[VAL_53:.*]] = arith.subi %[[VAL_52]], %[[VAL_40]] : index
-! CHECK: %[[VAL_54:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_55:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_56:.*]] = fir.convert %[[VAL_40]] : (index) -> i64
-! CHECK: %[[VAL_57:.*]] = fir.convert %[[VAL_53]] : (index) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_55]], %[[VAL_54]], %[[VAL_56]], %[[VAL_57]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_59:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_60:.*]] = fir.convert %[[VAL_35]] : (!fir.box<!fir.array<?x?xi32>>) -> !fir.box<none>
-! CHECK: %[[VAL_62:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_59]], %[[VAL_60]], %[[VAL_30]], %[[VAL_31]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: fir.call @_FortranAPointerSetBounds(
-! CHECK: fir.call @_FortranAPointerSetBounds(
-! CHECK: %[[VAL_89:.*]] = fir.call @_FortranAPointerAllocateSource(
-! CHECK: %[[VAL_90:.*]] = arith.constant true
-! CHECK: fir.call @_FortranAPointerSetBounds(
-! CHECK: fir.call @_FortranAPointerSetBounds(
-! CHECK: %[[VAL_135:.*]] = fir.call @_FortranAPointerAllocateSource(%{{.*}}, %{{.*}}, %[[VAL_90]]
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>
+! CHECK-SAME: %[[ARG1:.*]]: !fir.ref<!fir.array<?x?xi32>>
+! CHECK: %[[DECL_N:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[X1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {{{.*}}uniq_name = "_QFtest_pointer_2d_arrayEx1"}
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[X1]]
+! CHECK: %[[X2:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {{{.*}}uniq_name = "_QFtest_pointer_2d_arrayEx2"}
+! CHECK: %[[DECL_X2:.*]]:2 = hlfir.declare %[[X2]]
+! CHECK: %[[X3:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x?xi32>>> {{{.*}}uniq_name = "_QFtest_pointer_2d_arrayEx3"}
+! CHECK: %[[DECL_X3:.*]]:2 = hlfir.declare %[[X3]]
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[ARG1]]
+! CHECK: %[[BOX_A:.*]] = fir.embox %[[DECL_A]]#1
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X2:.*]] = fir.convert %[[DECL_X2]]#0
+! CHECK: %[[BOX_SOURCE_2:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X2]], %[[BOX_SOURCE_2]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
+! CHECK: hlfir.designate %[[DECL_A]]#0
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X3:.*]] = fir.convert %[[DECL_X3]]#0
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X3]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_2d_array(n, a)
integer, pointer :: x1(:,:), x2(:,:), x3(:,:)
@@ -95,63 +63,23 @@ subroutine test_pointer_2d_array(n, a)
end
! CHECK-LABEL: func.func @_QPtest_pointer_with_shapespec(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<i32> {fir.bindc_name = "n"},
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<?xi32>> {fir.bindc_name = "a"},
-! CHECK-SAME: %[[VAL_2:.*]]: !fir.ref<i32> {fir.bindc_name = "m"}) {
-! CHECK: %[[VAL_3:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>> {bindc_name = "x1", uniq_name = "_QFtest_pointer_with_shapespecEx1"}
-! CHECK: %[[VAL_4:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_5:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_6:.*]] = fir.shape %[[VAL_5]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_7:.*]] = fir.embox %[[VAL_4]](%[[VAL_6]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_7]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_8:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>> {bindc_name = "x2", uniq_name = "_QFtest_pointer_with_shapespecEx2"}
-! CHECK: %[[VAL_9:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_10:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_11:.*]] = fir.shape %[[VAL_10]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_12:.*]] = fir.embox %[[VAL_9]](%[[VAL_11]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_12]] to %[[VAL_8]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_13:.*]] = fir.load %[[VAL_0]] : !fir.ref<i32>
-! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (i32) -> i64
-! CHECK: %[[VAL_15:.*]] = fir.convert %[[VAL_14]] : (i64) -> index
-! CHECK: %[[VAL_16:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_17:.*]] = arith.cmpi sgt, %[[VAL_15]], %[[VAL_16]] : index
-! CHECK: %[[VAL_18:.*]] = arith.select %[[VAL_17]], %[[VAL_15]], %[[VAL_16]] : index
-! CHECK: %[[VAL_19:.*]] = arith.constant false
-! CHECK: %[[VAL_20:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_23:.*]] = fir.shape %[[VAL_18]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_24:.*]] = fir.embox %[[VAL_1]](%[[VAL_23]]) : (!fir.ref<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<?xi32>>
-! CHECK: %[[VAL_25:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_26:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_27:.*]] = fir.shape %[[VAL_26]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_28:.*]] = fir.embox %[[VAL_25]](%[[VAL_27]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_28]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_29:.*]] = arith.constant 2 : i32
-! CHECK: %[[VAL_30:.*]] = fir.load %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_31:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_32:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_29]] : (i32) -> i64
-! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_30]] : (i32) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_32]], %[[VAL_31]], %[[VAL_33]], %[[VAL_34]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_37:.*]] = fir.convert %[[VAL_24]] : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
-! CHECK: %[[VAL_39:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_36]], %[[VAL_37]], %[[VAL_19]], %[[VAL_20]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: %[[VAL_40:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_41:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_42:.*]] = fir.shape %[[VAL_41]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_43:.*]] = fir.embox %[[VAL_40]](%[[VAL_42]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_43]] to %[[VAL_8]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_44:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_45:.*]] = fir.load %[[VAL_0]] : !fir.ref<i32>
-! CHECK: %[[VAL_46:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_47:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_48:.*]] = fir.convert %[[VAL_44]] : (index) -> i64
-! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_45]] : (i32) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_47]], %[[VAL_46]], %[[VAL_48]], %[[VAL_49]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_51:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_52:.*]] = fir.convert %[[VAL_24]] : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
-! CHECK: %[[VAL_54:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_51]], %[[VAL_52]], %[[VAL_19]], %[[VAL_20]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: return
-! CHECK: }
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>{{.*}}%[[ARG1:.*]]: !fir.ref<!fir.array<?xi32>>{{.*}}%[[ARG2:.*]]: !fir.ref<i32>
+! CHECK: %[[DECL_N:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[DECL_M:.*]]:2 = hlfir.declare %[[ARG2]]
+! CHECK: %[[X1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>>
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[X1]]
+! CHECK: %[[X2:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>>
+! CHECK: %[[DECL_X2:.*]]:2 = hlfir.declare %[[X2]]
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[ARG1]]
+! CHECK: %[[BOX_A:.*]] = fir.embox %[[DECL_A]]#1
+! CHECK: fir.call @_FortranAPointerSetBounds(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X2:.*]] = fir.convert %[[DECL_X2]]#0
+! CHECK: %[[BOX_SOURCE_2:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X2]], %[[BOX_SOURCE_2]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_with_shapespec(n, a, m)
integer, pointer :: x1(:), x2(:)
@@ -161,55 +89,17 @@ subroutine test_pointer_with_shapespec(n, a, m)
end
! CHECK-LABEL: func.func @_QPtest_pointer_from_const(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<i32> {fir.bindc_name = "n"},
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<?xi32>> {fir.bindc_name = "a"}) {
-! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>> {bindc_name = "x1", uniq_name = "_QFtest_pointer_from_constEx1"}
-! CHECK: %[[VAL_3:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_4:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_5:.*]] = fir.shape %[[VAL_4]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_6:.*]] = fir.embox %[[VAL_3]](%[[VAL_5]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_7:.*]] = arith.constant false
-! CHECK: %[[VAL_8:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_11:.*]] = arith.constant 5 : index
-! CHECK: %[[VAL_13:.*]] = arith.constant 5 : index
-! CHECK: %[[VAL_14:.*]] = fir.shape %[[VAL_13]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_15:.*]] = fir.array_load %[[VAL_12:.*]](%[[VAL_14]]) : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.array<5xi32>
-! CHECK: %[[VAL_16:.*]] = fir.allocmem !fir.array<5xi32>
-! CHECK: %[[VAL_17:.*]] = fir.shape %[[VAL_11]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_18:.*]] = fir.array_load %[[VAL_16]](%[[VAL_17]]) : (!fir.heap<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.array<5xi32>
-! CHECK: %[[VAL_19:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_20:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_21:.*]] = arith.subi %[[VAL_11]], %[[VAL_19]] : index
-! CHECK: %[[VAL_22:.*]] = fir.do_loop %[[VAL_23:.*]] = %[[VAL_20]] to %[[VAL_21]] step %[[VAL_19]] unordered iter_args(%[[VAL_24:.*]] = %[[VAL_18]]) -> (!fir.array<5xi32>) {
-! CHECK: %[[VAL_25:.*]] = fir.array_fetch %[[VAL_15]], %[[VAL_23]] : (!fir.array<5xi32>, index) -> i32
-! CHECK: %[[VAL_26:.*]] = fir.array_update %[[VAL_24]], %[[VAL_25]], %[[VAL_23]] : (!fir.array<5xi32>, i32, index) -> !fir.array<5xi32>
-! CHECK: fir.result %[[VAL_26]] : !fir.array<5xi32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_18]], %[[VAL_27:.*]] to %[[VAL_16]] : !fir.array<5xi32>, !fir.array<5xi32>, !fir.heap<!fir.array<5xi32>>
-! CHECK: %[[VAL_28:.*]] = fir.shape %[[VAL_11]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_29:.*]] = fir.embox %[[VAL_16]](%[[VAL_28]]) : (!fir.heap<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xi32>>
-! CHECK: %[[VAL_30:.*]] = fir.zero_bits !fir.ptr<!fir.array<?xi32>>
-! CHECK: %[[VAL_31:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_32:.*]] = fir.shape %[[VAL_31]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_33:.*]] = fir.embox %[[VAL_30]](%[[VAL_32]]) : (!fir.ptr<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?xi32>>>
-! CHECK: fir.store %[[VAL_33]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
-! CHECK: %[[VAL_34:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_35:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_36:.*]]:3 = fir.box_dims %[[VAL_29]], %[[VAL_35]] : (!fir.box<!fir.array<5xi32>>, index) -> (index, index, index)
-! CHECK: %[[VAL_37:.*]] = arith.addi %[[VAL_36]]#1, %[[VAL_34]] : index
-! CHECK: %[[VAL_38:.*]] = arith.subi %[[VAL_37]], %[[VAL_34]] : index
-! CHECK: %[[VAL_39:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_41:.*]] = fir.convert %[[VAL_34]] : (index) -> i64
-! CHECK: %[[VAL_42:.*]] = fir.convert %[[VAL_38]] : (index) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_40]], %[[VAL_39]], %[[VAL_41]], %[[VAL_42]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_44:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_45:.*]] = fir.convert %[[VAL_29]] : (!fir.box<!fir.array<5xi32>>) -> !fir.box<none>
-! CHECK: %[[VAL_47:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_44]], %[[VAL_45]], %[[VAL_7]], %[[VAL_8]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: fir.freemem %[[VAL_16]] : !fir.heap<!fir.array<5xi32>>
-! CHECK: return
-! CHECK: }
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>
+! CHECK: %[[DECL_N:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[X1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?xi32>>>
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[X1]]
+! CHECK: %[[CONST_ADDR:.*]] = fir.address_of(@_QQro.5xi4.0)
+! CHECK: %[[DECL_CONST:.*]]:2 = hlfir.declare %[[CONST_ADDR]]
+! CHECK: %[[BOX_CONST:.*]] = fir.embox %[[DECL_CONST]]#0
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_CONST]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_from_const(n, a)
integer, pointer :: x1(:)
@@ -219,46 +109,19 @@ subroutine test_pointer_from_const(n, a)
end
! CHECK-LABEL: func.func @_QPtest_pointer_chararray(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<i32> {fir.bindc_name = "n"},
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.boxchar<1> {fir.bindc_name = "a"}) {
-! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>> {bindc_name = "x1", uniq_name = "_QFtest_pointer_chararrayEx1"}
-! CHECK: %[[VAL_3:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x!fir.char<1,4>>>
-! CHECK: %[[VAL_4:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_5:.*]] = fir.shape %[[VAL_4]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_6:.*]] = fir.embox %[[VAL_3]](%[[VAL_5]]) : (!fir.ptr<!fir.array<?x!fir.char<1,4>>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>
-! CHECK: fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>>
-! CHECK: %[[VAL_7:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_7]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<?x!fir.char<1,?>>>
-! CHECK: %[[VAL_9:.*]] = fir.load %[[VAL_0]] : !fir.ref<i32>
-! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> i64
-! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_10]] : (i64) -> index
-! CHECK: %[[VAL_12:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_13:.*]] = arith.cmpi sgt, %[[VAL_11]], %[[VAL_12]] : index
-! CHECK: %[[VAL_14:.*]] = arith.select %[[VAL_13]], %[[VAL_11]], %[[VAL_12]] : index
-! CHECK: %[[VAL_15:.*]] = arith.constant false
-! CHECK: %[[VAL_16:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_19:.*]] = fir.shape %[[VAL_14]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_20:.*]] = fir.embox %[[VAL_8]](%[[VAL_19]]) typeparams %[[VAL_7]]#1 : (!fir.ref<!fir.array<?x!fir.char<1,?>>>, !fir.shape<1>, index) -> !fir.box<!fir.array<?x!fir.char<1,?>>>
-! CHECK: %[[VAL_21:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x!fir.char<1,4>>>
-! CHECK: %[[VAL_22:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_23:.*]] = fir.shape %[[VAL_22]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_24:.*]] = fir.embox %[[VAL_21]](%[[VAL_23]]) : (!fir.ptr<!fir.array<?x!fir.char<1,4>>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>
-! CHECK: fir.store %[[VAL_24]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>>
-! CHECK: %[[VAL_25:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_26:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_27:.*]]:3 = fir.box_dims %[[VAL_20]], %[[VAL_26]] : (!fir.box<!fir.array<?x!fir.char<1,?>>>, index) -> (index, index, index)
-! CHECK: %[[VAL_28:.*]] = arith.addi %[[VAL_27]]#1, %[[VAL_25]] : index
-! CHECK: %[[VAL_29:.*]] = arith.subi %[[VAL_28]], %[[VAL_25]] : index
-! CHECK: %[[VAL_30:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_31:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_32:.*]] = fir.convert %[[VAL_25]] : (index) -> i64
-! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_29]] : (index) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_31]], %[[VAL_30]], %[[VAL_32]], %[[VAL_33]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_20]] : (!fir.box<!fir.array<?x!fir.char<1,?>>>) -> !fir.box<none>
-! CHECK: %[[VAL_38:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_35]], %[[VAL_36]], %[[VAL_15]], %[[VAL_16]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: return
-! CHECK: }
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>
+! CHECK-SAME: %[[ARG1:.*]]: !fir.boxchar<1>
+! CHECK: %[[DECL_N:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[X1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.char<1,4>>>>
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[X1]]
+! CHECK: %[[UNBOX:.*]]:2 = fir.unboxchar %[[ARG1]]
+! CHECK: %[[CONV:.*]] = fir.convert %[[UNBOX]]#0
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[CONV]]
+! CHECK: %[[BOX_A:.*]] = fir.embox %[[DECL_A]]#1
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_chararray(n, a)
character(4), pointer :: x1(:)
@@ -269,38 +132,18 @@ subroutine test_pointer_chararray(n, a)
end
! CHECK-LABEL: func.func @_QPtest_pointer_char(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<i32> {fir.bindc_name = "n"},
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.boxchar<1> {fir.bindc_name = "a"}) {
-! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_3:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.char<1,?>>> {bindc_name = "x1", uniq_name = "_QFtest_pointer_charEx1"}
-! CHECK: %[[VAL_4:.*]] = fir.alloca !fir.ptr<!fir.char<1,?>> {uniq_name = "_QFtest_pointer_charEx1.addr"}
-! CHECK: %[[VAL_5:.*]] = fir.alloca index {uniq_name = "_QFtest_pointer_charEx1.len"}
-! CHECK: %[[VAL_6:.*]] = fir.zero_bits !fir.ptr<!fir.char<1,?>>
-! CHECK: fir.store %[[VAL_6]] to %[[VAL_4]] : !fir.ref<!fir.ptr<!fir.char<1,?>>>
-! CHECK: %[[VAL_7:.*]] = arith.constant false
-! CHECK: %[[VAL_8:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_11:.*]] = fir.embox %[[VAL_2]]#0 typeparams %[[VAL_2]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
-! CHECK: %[[VAL_12:.*]] = fir.zero_bits !fir.ptr<!fir.char<1,?>>
-! CHECK: %[[VAL_13:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_14:.*]] = fir.embox %[[VAL_12]] typeparams %[[VAL_13]] : (!fir.ptr<!fir.char<1,?>>, index) -> !fir.box<!fir.ptr<!fir.char<1,?>>>
-! CHECK: fir.store %[[VAL_14]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.char<1,?>>>>
-! CHECK: %[[VAL_15:.*]] = fir.box_elesize %[[VAL_11]] : (!fir.box<!fir.char<1,?>>) -> index
-! CHECK-DAG: %[[VAL_16:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.char<1,?>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK-DAG: %[[VAL_17:.*]] = fir.convert %[[VAL_15]] : (index) -> i64
-! CHECK-DAG: %[[VAL_18:.*]] = arith.constant 1 : i32
-! CHECK-DAG: %[[VAL_19:.*]] = arith.constant 0 : i32
-! CHECK-DAG: %[[VAL_20:.*]] = arith.constant 0 : i32
-! CHECK: fir.call @_FortranAPointerNullifyCharacter(%[[VAL_16]], %[[VAL_17]], %[[VAL_18]], %[[VAL_19]], %[[VAL_20]]) {{.*}}: (!fir.ref<!fir.box<none>>, i64, i32, i32, i32) -> ()
-! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_3]] : (!fir.ref<!fir.box<!fir.ptr<!fir.char<1,?>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_23:.*]] = fir.convert %[[VAL_11]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
-! CHECK: %[[VAL_25:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_22]], %[[VAL_23]], %[[VAL_7]], %[[VAL_8]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: %[[VAL_26:.*]] = fir.load %[[VAL_3]] : !fir.ref<!fir.box<!fir.ptr<!fir.char<1,?>>>>
-! CHECK: %[[VAL_27:.*]] = fir.box_elesize %[[VAL_26]] : (!fir.box<!fir.ptr<!fir.char<1,?>>>) -> index
-! CHECK: %[[VAL_28:.*]] = fir.box_addr %[[VAL_26]] : (!fir.box<!fir.ptr<!fir.char<1,?>>>) -> !fir.ptr<!fir.char<1,?>>
-! CHECK: fir.store %[[VAL_28]] to %[[VAL_4]] : !fir.ref<!fir.ptr<!fir.char<1,?>>>
-! CHECK: fir.store %[[VAL_27]] to %[[VAL_5]] : !fir.ref<index>
-! CHECK: return
-! CHECK: }
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>
+! CHECK-SAME: %[[ARG1:.*]]: !fir.boxchar<1>
+! CHECK: %[[UNBOX:.*]]:2 = fir.unboxchar %[[ARG1]]
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[UNBOX]]#0
+! CHECK: %[[DECL_N:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[X1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.char<1,?>>>
+! CHECK: %[[DECL_X1:.*]]:2 = hlfir.declare %[[X1]]
+! CHECK: %[[BOX_A:.*]] = fir.embox %[[DECL_A]]#1
+! CHECK: fir.call @_FortranAPointerNullifyCharacter
+! CHECK: %[[BOX_X1:.*]] = fir.convert %[[DECL_X1]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[BOX_A]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_X1]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_char(n, a)
character(:), pointer :: x1
@@ -311,40 +154,15 @@ subroutine test_pointer_char(n, a)
end
! CHECK-LABEL: func.func @_QPtest_pointer_derived_type(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>> {fir.bindc_name = "y"}) {
-! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>> {bindc_name = "z", uniq_name = "_QFtest_pointer_derived_typeEz"}
-! CHECK: %[[VAL_2:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>
-! CHECK: %[[VAL_3:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_4:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_5:.*]] = fir.embox %[[VAL_2]](%[[VAL_4]]) : (!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>
-! CHECK: fir.store %[[VAL_5]] to %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>
-! CHECK: %[[VAL_6:.*]] = arith.constant false
-! CHECK: %[[VAL_7:.*]] = fir.absent !fir.box<none>
-! CHECK: %[[VAL_10:.*]] = fir.load %[[VAL_0]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>
-! CHECK: %[[VAL_11:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_12:.*]]:3 = fir.box_dims %[[VAL_10]], %[[VAL_11]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>, index) -> (index, index, index)
-! CHECK: %[[VAL_13:.*]] = fir.shift %[[VAL_12]]#0 : (index) -> !fir.shift<1>
-! CHECK: %[[VAL_14:.*]] = fir.rebox %[[VAL_10]](%[[VAL_13]]) : (!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>, !fir.shift<1>) -> !fir.box<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>
-! CHECK: %[[VAL_15:.*]] = fir.zero_bits !fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>
-! CHECK: %[[VAL_16:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_17:.*]] = fir.shape %[[VAL_16]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_18:.*]] = fir.embox %[[VAL_15]](%[[VAL_17]]) : (!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>, !fir.shape<1>) -> !fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>
-! CHECK: fir.store %[[VAL_18]] to %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>
-! CHECK: %[[VAL_19:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_20:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_21:.*]]:3 = fir.box_dims %[[VAL_14]], %[[VAL_20]] : (!fir.box<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>, index) -> (index, index, index)
-! CHECK: %[[VAL_22:.*]] = arith.addi %[[VAL_21]]#1, %[[VAL_12]]#0 : index
-! CHECK: %[[VAL_23:.*]] = arith.subi %[[VAL_22]], %[[VAL_19]] : index
-! CHECK: %[[VAL_24:.*]] = arith.constant 0 : i32
-! CHECK: %[[VAL_25:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_12]]#0 : (index) -> i64
-! CHECK: %[[VAL_27:.*]] = fir.convert %[[VAL_23]] : (index) -> i64
-! CHECK: fir.call @_FortranAPointerSetBounds(%[[VAL_25]], %[[VAL_24]], %[[VAL_26]], %[[VAL_27]]) {{.*}}: (!fir.ref<!fir.box<none>>, i32, i64, i64) -> ()
-! CHECK: %[[VAL_29:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_30:.*]] = fir.convert %[[VAL_14]] : (!fir.box<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>) -> !fir.box<none>
-! CHECK: %[[VAL_32:.*]] = fir.call @_FortranAPointerAllocateSource(%[[VAL_29]], %[[VAL_30]], %[[VAL_6]], %[[VAL_7]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32
-! CHECK: return
-! CHECK: }
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>>
+! CHECK: %[[DECL_Y:.*]]:2 = hlfir.declare %[[ARG0]]
+! CHECK: %[[Z:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<?x!fir.type<_QFtest_pointer_derived_typeTt{x:!fir.box<!fir.ptr<!fir.array<?xi32>>>}>>>>
+! CHECK: %[[DECL_Z:.*]]:2 = hlfir.declare %[[Z]]
+! CHECK: %[[LOAD_Y:.*]] = fir.load %[[DECL_Y]]#0
+! CHECK: fir.call @_FortranAPointerSetBounds
+! CHECK: %[[BOX_Z:.*]] = fir.convert %[[DECL_Z]]#0
+! CHECK: %[[BOX_SOURCE:.*]] = fir.convert %[[LOAD_Y]]
+! CHECK: fir.call @_FortranAPointerAllocateSource(%[[BOX_Z]], %[[BOX_SOURCE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}})
subroutine test_pointer_derived_type(y)
type t
diff --git a/flang/test/Lower/array-constructor-2.f90 b/flang/test/Lower/array-constructor-2.f90
index c026c0673fbbd..e08fd111b8649 100644
--- a/flang/test/Lower/array-constructor-2.f90
+++ b/flang/test/Lower/array-constructor-2.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -hlfir=false --use-desc-for-alloc=false %s -o - | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
! Constant array ctor.
! CHECK-LABEL: func @_QPtest1(
@@ -10,11 +10,15 @@ subroutine test1(a, b)
! Array ctors for constant arrays should be outlined as constant globals.
! Look at inline constructor case
- ! CHECK: %{{.*}} = fir.address_of(@_QQro.3xr4.0) : !fir.ref<!fir.array<3xf32>>
+ ! CHECK: %[[CONST:.*]] = fir.address_of(@_QQro.3xr4.0) : !fir.ref<!fir.array<3xf32>>
+ ! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[CONST]](%{{.*}}) {{{.*}}uniq_name = "_QQro.3xr4.0"}
+ ! CHECK: hlfir.assign %[[DECL]]#0 to %{{.*}}
a = (/ 1.0, 2.0, 3.0 /)
! Look at PARAMETER case
- ! CHECK: %{{.*}} = fir.address_of(@_QQro.4xi4.1) : !fir.ref<!fir.array<4xi32>>
+ ! CHECK: %[[CONST2:.*]] = fir.address_of(@_QQro.4xi4.1) : !fir.ref<!fir.array<4xi32>>
+ ! CHECK: %[[DECL2:.*]]:2 = hlfir.declare %[[CONST2]](%{{.*}}) {{{.*}}uniq_name = "_QQro.4xi4.1"}
+ ! CHECK: hlfir.assign %[[DECL2]]#0 to %{{.*}}
b = constant_array
end subroutine test1
@@ -26,28 +30,28 @@ subroutine test2(a, b)
real, external :: f
! Look for the 5 store patterns
- ! CHECK: %[[tmp:.*]] = fir.allocmem !fir.array<5xf32>
- ! CHECK: %[[val:.*]] = fir.call @_QPf(%[[b]]) {{.*}}: (!fir.ref<f32>) -> f32
- ! CHECK: %[[loc:.*]] = fir.coordinate_of %{{.*}}, %{{.*}} : (!fir.heap<!fir.array<5xf32>>, index) -> !fir.ref<f32>
- ! CHECK: fir.store %[[val]] to %[[loc]] : !fir.ref<f32>
- ! CHECK: fir.call @_QPf(%{{.*}}) {{.*}}: (!fir.ref<f32>) -> f32
- ! CHECK: fir.coordinate_of %{{.*}}, %{{.*}} : (!fir.heap<!fir.array<5xf32>>, index) -> !fir.ref<f32>
- ! CHECK: fir.store
- ! CHECK: fir.call @_QPf(
- ! CHECK: fir.coordinate_of %
- ! CHECK: fir.store
- ! CHECK: fir.call @_QPf(
- ! CHECK: fir.coordinate_of %
- ! CHECK: fir.store
- ! CHECK: fir.call @_QPf(
- ! CHECK: fir.coordinate_of %
- ! CHECK: fir.store
+ ! CHECK: %[[ALLOC:.*]] = fir.allocmem !fir.array<5xf32>
+ ! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[ALLOC]](%{{.*}})
+ ! CHECK: %[[VAL:.*]] = fir.call @_QPf
+ ! CHECK: %[[DESIGNATE:.*]] = hlfir.designate %[[DECL]]#0 (%{{.*}})
+ ! CHECK: hlfir.assign %[[VAL]] to %[[DESIGNATE]]
+ ! CHECK: fir.call @_QPf
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
+ ! CHECK: fir.call @_QPf
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
+ ! CHECK: fir.call @_QPf
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
+ ! CHECK: fir.call @_QPf
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
! After the ctor done, loop to copy result to `a`
- ! CHECK-DAG: fir.array_coor %[[tmp:.*]](%
- ! CHECK-DAG: %[[ai:.*]] = fir.array_coor %[[a]](%
- ! CHECK: fir.store %{{.*}} to %[[ai]] : !fir.ref<f32>
- ! CHECK: fir.freemem %[[tmp]] : !fir.heap<!fir.array<5xf32>>
+ ! CHECK: %[[EXPR:.*]] = hlfir.as_expr %[[DECL]]#0
+ ! CHECK: hlfir.assign %[[EXPR]] to %{{.*}}
+ ! CHECK: hlfir.destroy %[[EXPR]]
a = [f(b), f(b+1), f(b+2), f(b+5), f(b+11)]
end subroutine test2
@@ -70,29 +74,15 @@ end function test3c
end interface
! CHECK: fir.call @_QPtest3b
- ! CHECK: %{{.*}}:3 = fir.box_dims %{{.*}}, %{{.*}} : (!fir.box<!fir.heap<!fir.array<?xf32>>>, index) -> (index, index, index)
- ! CHECK: %{{.*}} = fir.box_addr %{{.*}} : (!fir.box<!fir.heap<!fir.array<?xf32>>>) -> !fir.heap<!fir.array<?xf32>>
- ! CHECK: %[[tmp:.*]] = fir.allocmem f32, %c32
call test3b(b)
- ! CHECK: %[[hp1:.*]] = fir.allocmem !fir.array<?xf32>, %{{.*}} {uniq_name = ".array.expr"}
- ! CHECK-DAG: %[[rep:.*]] = fir.convert %{{.*}} : (!fir.heap<f32>) -> !fir.ref<i8>
- ! CHECK-DAG: %[[res:.*]] = fir.convert %{{.*}} : (index) -> i64
- ! CHECK: %{{.*}} = fir.call @realloc(%[[rep]], %[[res]]) {{.*}}: (!fir.ref<i8>, i64) -> !fir.ref<i8>
- ! CHECK: "llvm.intr.memcpy"(%{{.*}}, %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
+ ! CHECK: fir.call @_FortranAInitArrayConstructorVector
+ ! CHECK: fir.call @_FortranAPushArrayConstructorValue
! CHECK: fir.call @_QPtest3c
! CHECK: fir.save_result
- ! CHECK: %[[tmp2:.*]] = fir.allocmem !fir.array<?xf32>, %{{.*}}#1 {uniq_name = ".array.expr"}
- ! CHECK: fir.call @realloc
- ! CHECK: "llvm.intr.memcpy"(%{{.*}}, %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
- ! CHECK: fir.array_coor %[[tmp:.*]](%{{.*}}) %{{.*}} : (!fir.heap<!fir.array<?xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
- ! CHECK-NEXT: fir.load
- ! CHECK-NEXT: fir.array_coor %arg0 %{{.*}} : (!fir.box<!fir.array<?xf32>>, index) -> !fir.ref<f32>
- ! CHECK-NEXT: fir.store
- ! CHECK: fir.freemem %[[tmp]]
- ! CHECK: fir.freemem %[[tmp2]]
- ! CHECK: %[[alli:.*]] = fir.box_addr %{{.*}} : (!fir.box<!fir.heap<!fir.array<?xf32>>>) -> !fir.heap<!fir.array<?xf32>>
- ! CHECK: fir.freemem %[[alli]]
- ! CHECK: fir.freemem %[[hp1]]
+ ! CHECK: fir.call @_FortranAPushArrayConstructorValue
+ ! CHECK: %[[EXPR:.*]] = hlfir.as_expr %{{.*}}
+ ! CHECK: hlfir.assign %[[EXPR]] to %{{.*}}
+ ! CHECK: hlfir.destroy %[[EXPR]]
a = (/ b, test3c() /)
end subroutine test3
@@ -103,18 +93,19 @@ subroutine test4(a, b, n1, m1)
integer, external :: f1, f2, f3
! Dynamic array ctor with dynamic extent using implied do loops.
- ! CHECK-DAG: fir.alloca index {bindc_name = ".buff.pos"}
- ! CHECK-DAG: fir.alloca index {bindc_name = ".buff.size"}
- ! CHECK-DAG: %[[c32:.*]] = arith.constant 32 : index
- ! CHECK: fir.allocmem f32, %[[c32]]
- ! CHECK: fir.call @_QPf1(%{{.*}}) {{.*}}: (!fir.ref<i32>) -> i32
- ! CHECK: fir.call @_QPf2(%arg2) {{.*}}: (!fir.ref<i32>) -> i32
- ! CHECK: fir.call @_QPf3(%{{.*}}) {{.*}}: (!fir.ref<i32>) -> i32
- ! CHECK: %[[q:.*]] = fir.coordinate_of %arg1, %{{.*}}, %{{.*}} : (!fir.box<!fir.array<?x?xf32>>, i64, i64) -> !fir.ref<f32>
- ! CHECK: %[[q2:.*]] = fir.load %[[q]] : !fir.ref<f32>
- ! CHECK: fir.store %[[q2]] to %{{.*}} : !fir.ref<f32>
- ! CHECK: fir.freemem %{{.*}} : !fir.heap<!fir.array<?xf32>>
- ! CHECK-NEXT: return
+ ! CHECK: fir.call @_FortranAInitArrayConstructorVector
+ ! CHECK: fir.do_loop
+ ! CHECK: hlfir.associate
+ ! CHECK: fir.call @_QPf1
+ ! CHECK: fir.call @_QPf2
+ ! CHECK: fir.call @_QPf3
+ ! CHECK: fir.do_loop
+ ! CHECK: hlfir.designate
+ ! CHECK: fir.load
+ ! CHECK: fir.store
+ ! CHECK: fir.call @_FortranAPushArrayConstructorSimpleScalar
+ ! CHECK: hlfir.as_expr
+ ! CHECK: hlfir.assign
a = [ ((b(i,j), j=f1(i),f2(n1),f3(m1+i)), i=1,n1,m1) ]
end subroutine test4
@@ -127,19 +118,13 @@ subroutine test5(a, array2)
! Array ctor with runtime element values and constant extents.
! Concatenation of array values of constant extent.
- ! CHECK: %[[res:.*]] = fir.allocmem !fir.array<4xf32>
- ! CHECK: fir.address_of(@_QQro.2xr4.2) : !fir.ref<!fir.array<2xf32>>
- ! CHECK: %[[tmp1:.*]] = fir.allocmem !fir.array<2xf32>
- ! CHECK: "llvm.intr.memcpy"(%{{.*}}, %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
- ! CHECK: %[[tmp2:.*]] = fir.allocmem !fir.array<2xf32>
- ! CHECK: = fir.array_coor %[[array2]](%{{.*}}) %{{.*}} : (!fir.ref<!fir.array<2xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
- ! CHECK: = fir.array_coor %[[tmp2]](%{{.*}}) %{{.*}} : (!fir.heap<!fir.array<2xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
- ! CHECK: "llvm.intr.memcpy"(%{{.*}}, %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
- ! CHECK: = fir.array_coor %{{.*}}(%{{.*}}) %{{.*}} : (!fir.heap<!fir.array<4xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
- ! CHECK: = fir.array_coor %[[a]] %{{.*}} : (!fir.box<!fir.array<?xf32>>, index) -> !fir.ref<f32>
- ! CHECK-DAG: fir.freemem %{{.*}} : !fir.heap<!fir.array<4xf32>>
- ! CHECK-DAG: fir.freemem %[[tmp2]] : !fir.heap<!fir.array<2xf32>>
- ! CHECK-DAG: fir.freemem %[[tmp1]] : !fir.heap<!fir.array<2xf32>>
+ ! CHECK: fir.call @_FortranAInitArrayConstructorVector
+ ! CHECK: fir.address_of(@_QQro.{{.*}})
+ ! CHECK: fir.call @_FortranAPushArrayConstructorValue
+ ! CHECK: fir.call @_FortranAPushArrayConstructorValue
+ ! CHECK: %[[EXPR:.*]] = hlfir.as_expr
+ ! CHECK: hlfir.assign %[[EXPR]]
+ ! CHECK: hlfir.destroy %[[EXPR]]
! CHECK: return
a = [ const_array1, array2 ]
end subroutine test5
@@ -148,25 +133,21 @@ end subroutine test5
subroutine test6(c, d, e)
character(5) :: c(2)
character(5) :: d, e
- ! CHECK: = fir.allocmem !fir.array<2x!fir.char<1,5>>
- ! CHECK: fir.call @realloc
- ! CHECK: %[[t:.*]] = fir.coordinate_of %{{.*}}, %{{.*}} : (!fir.heap<!fir.array<2x!fir.char<1,5>>>, index) -> !fir.ref<!fir.char<1,5>>
- ! CHECK: %[[to:.*]] = fir.convert %[[t]] : (!fir.ref<!fir.char<1,5>>) -> !llvm.ptr
- ! CHECK: "llvm.intr.memcpy"(%[[to]], %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
- ! CHECK: fir.call @realloc
- ! CHECK: %[[t:.*]] = fir.coordinate_of %{{.*}}, %{{.*}} : (!fir.heap<!fir.array<2x!fir.char<1,5>>>, index) -> !fir.ref<!fir.char<1,5>>
- ! CHECK: %[[to:.*]] = fir.convert %[[t]] : (!fir.ref<!fir.char<1,5>>) -> !llvm.ptr
- ! CHECK: "llvm.intr.memcpy"(%[[to]], %{{.*}}, %{{.*}}) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i64) -> ()
- ! CHECK: fir.freemem %{{.*}} : !fir.heap<!fir.array<2x!fir.char<1,5>>>
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
+ ! CHECK: hlfir.designate
+ ! CHECK: hlfir.assign
+ ! CHECK: %[[EXPR:.*]] = hlfir.as_expr
+ ! CHECK: hlfir.assign %[[EXPR]]
+ ! CHECK: hlfir.destroy %[[EXPR]]
c = (/ d, e /)
end subroutine test6
! CHECK-LABEL: func @_QPtest7(
-! CHECK: %[[i:.*]] = fir.convert %{{.*}} : (index) -> i8
-! CHECK: %[[und:.*]] = fir.undefined !fir.char<1>
-! CHECK: %[[scalar:.*]] = fir.insert_value %[[und]], %[[i]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1>
-! CHECK: ^bb{{[0-9]+}}(%{{.*}}: !fir.heap<!fir.char<1>>): // 2 preds
-! CHECK: fir.store %[[scalar]] to %{{.*}} : !fir.ref<!fir.char<1>>
+! CHECK: hlfir.elemental
+! CHECK: fir.insert_value
+! CHECK: hlfir.yield_element
+! CHECK: hlfir.assign
subroutine test7(a, n)
character(1) :: a(n)
a = (/ (CHAR(i), i=1,n) /)
diff --git a/flang/test/Lower/array-elemental-calls-3.f90 b/flang/test/Lower/array-elemental-calls-3.f90
index cba478df814ce..6add55cd7a8b7 100644
--- a/flang/test/Lower/array-elemental-calls-3.f90
+++ b/flang/test/Lower/array-elemental-calls-3.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -o - -emit-fir -hlfir=false %s | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
! Test lowering of elemental calls with array arguments that use array
! elements as indices.
@@ -22,15 +22,24 @@ real elemental function elem_func_r(r)
! CHECK-LABEL: func @_QMtest_opsPcheck_array_elems_as_indices() {
subroutine check_array_elems_as_indices()
! CHECK: %[[A_ADDR:.*]] = fir.address_of(@_QMtest_opsEa) : !fir.ref<!fir.array<3xi32>>
+! CHECK: %[[A_DECL:.*]]:2 = hlfir.declare %[[A_ADDR]]
! CHECK: %[[V_ADDR:.*]] = fir.address_of(@_QMtest_opsEv) : !fir.ref<!fir.array<3xi32>>
-! CHECK: %[[V:.*]] = fir.array_load %[[V_ADDR]](%{{.*}}) : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> !fir.array<3xi32>
-! CHECK: %[[A:.*]] = fir.array_load %[[A_ADDR]](%{{.*}}) : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> !fir.array<3xi32>
-! CHECK: fir.do_loop
+! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V_ADDR]]
+! CHECK: hlfir.forall lb {
+! CHECK: } ub {
+! CHECK: } (%[[I:.*]]: i32) {
+! CHECK: %[[I_IDX:.*]] = hlfir.forall_index "i" %[[I]]
+! CHECK: hlfir.region_assign {
+! CHECK: %[[SLICE:.*]] = hlfir.designate %[[A_DECL]]#0
+! CHECK: hlfir.elemental {{.*}} unordered : (!fir.shape<1>) -> !hlfir.expr<?xi32> {
+! CHECK: ^bb0(%[[ARG:.*]]: index):
+! CHECK: %[[ELEM_ADDR:.*]] = hlfir.designate %[[SLICE]] (%[[ARG]])
+! CHECK: %[[RES:.*]] = fir.call @_QPelem_func_i(%[[ELEM_ADDR]])
+! CHECK: hlfir.yield_element %[[RES]] : i32
+! CHECK: }
+! CHECK: }
+! CHECK: }
forall (i=1:3)
-! CHECK: %{{.*}} = fir.array_fetch %[[V]], %{{.*}} : (!fir.array<3xi32>, index) -> i32
-! CHECK: fir.do_loop
-! CHECK: %[[ELEM:.*]] = fir.array_access %[[A]], %{{.*}} : (!fir.array<3xi32>, index) -> !fir.ref<i32>
-! CHECK: %{{.*}} = fir.call @_QPelem_func_i(%[[ELEM]]){{.*}} : (!fir.ref<i32>) -> i32
b(i:i) = elem_func_i(a(v(i):v(i)))
end forall
end subroutine
@@ -38,6 +47,8 @@ subroutine check_array_elems_as_indices()
! CHECK-LABEL: func @_QMtest_opsPcheck_not_assert() {
subroutine check_not_assert()
! Implicit path.
+! CHECK: hlfir.elemental
+! CHECK: fir.call @_QPelem_func_i
b = 10 + elem_func_i(a)
! Expression as argument, instead of variable.
diff --git a/flang/test/Lower/array-elemental-calls.f90 b/flang/test/Lower/array-elemental-calls.f90
index 93d2979ec9383..bf8a233104db6 100644
--- a/flang/test/Lower/array-elemental-calls.f90
+++ b/flang/test/Lower/array-elemental-calls.f90
@@ -1,5 +1,5 @@
! Test lowering of elemental calls in array expressions.
-! RUN: bbc -o - -emit-fir -hlfir=false %s | FileCheck %s
+! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
module scalar_in_elem
@@ -19,14 +19,15 @@ elemental integer function elem_by_valueref(a,b) result(r)
! CHECK-SAME: %[[arg0:.*]]: !fir.ref<!fir.array<100xi32>>{{.*}}, %[[arg1:.*]]: !fir.ref<!fir.array<100xi32>>{{.*}}) {
subroutine test_elem_by_ref(i, j)
integer :: i(100), j(100)
- ! CHECK: %[[tmp:.*]] = fir.alloca f32
+ ! CHECK: %[[i_decl:.*]]:2 = hlfir.declare %[[arg0]]
+ ! CHECK: %[[j_decl:.*]]:2 = hlfir.declare %[[arg1]]
! CHECK: %[[cst:.*]] = arith.constant 4.200000e+01 : f32
- ! CHECK: fir.store %[[cst]] to %[[tmp]] : !fir.ref<f32>
-
- ! CHECK: fir.do_loop
- ! CHECK: %[[j:.*]] = fir.array_coor %[[arg1]](%{{.*}}) %{{.*}} : (!fir.ref<!fir.array<100xi32>>, !fir.shape<1>, index) -> !fir.ref<i32>
- ! CHECK: fir.call @_QMscalar_in_elemPelem_by_ref(%[[j]], %[[tmp]]) {{.*}}: (!fir.ref<i32>, !fir.ref<f32>) -> i32
- ! CHECK: fir.result
+ ! CHECK: hlfir.elemental {{.*}} {
+ ! CHECK: ^bb0(%[[idx:.*]]: index):
+ ! CHECK: %[[j_elem:.*]] = hlfir.designate %[[j_decl]]#0 (%[[idx]])
+ ! CHECK: %[[assoc:.*]]:3 = hlfir.associate %[[cst]]
+ ! CHECK: fir.call @_QMscalar_in_elemPelem_by_ref(%[[j_elem]], %[[assoc]]#0)
+ ! CHECK: }
i = elem_by_ref(j, 42.)
end
@@ -34,13 +35,15 @@ subroutine test_elem_by_ref(i, j)
! CHECK-SAME: %[[arg0:.*]]: !fir.ref<!fir.array<100xi32>>{{.*}}, %[[arg1:.*]]: !fir.ref<!fir.array<100xi32>>{{.*}}) {
subroutine test_elem_by_valueref(i, j)
integer :: i(100), j(100)
- ! CHECK: %[[jload:.*]] = fir.array_load %[[arg1]]
+ ! CHECK: %[[i_decl:.*]]:2 = hlfir.declare %[[arg0]]
+ ! CHECK: %[[j_decl:.*]]:2 = hlfir.declare %[[arg1]]
! CHECK: %[[cst:.*]] = arith.constant 4.200000e+01 : f32
-
- ! CHECK: fir.do_loop
- ! CHECK: %[[j:.*]] = fir.array_fetch %[[jload]], %{{.*}} : (!fir.array<100xi32>, index) -> i32
- ! CHECK: fir.call @_QMscalar_in_elemPelem_by_valueref(%[[j]], %[[cst]]) {{.*}}: (i32, f32) -> i32
- ! CHECK: fir.result
+ ! CHECK: hlfir.elemental {{.*}} {
+ ! CHECK: ^bb0(%[[idx:.*]]: index):
+ ! CHECK: %[[j_elem_addr:.*]] = hlfir.designate %[[j_decl]]#0 (%[[idx]])
+ ! CHECK: %[[j_val:.*]] = fir.load %[[j_elem_addr]]
+ ! CHECK: fir.call @_QMscalar_in_elemPelem_by_valueref(%[[j_val]], %[[cst]])
+ ! CHECK: }
i = elem_by_valueref(j, 42.)
end
end module
@@ -63,40 +66,15 @@ elemental impure integer function impure_func(j)
end subroutine
! CHECK-LABEL: func @_QPtest_loop_order(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}, %[[VAL_1:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) {
-! CHECK: %[[VAL_2:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_3:.*]]:3 = fir.box_dims %[[VAL_0]], %[[VAL_2]] : (!fir.box<!fir.array<?xi32>>, index) -> (index, index, index)
-! CHECK: %[[VAL_4:.*]] = fir.array_load %[[VAL_0]] : (!fir.box<!fir.array<?xi32>>) -> !fir.array<?xi32>
-! CHECK: %[[VAL_5:.*]] = arith.constant 42 : i32
-! CHECK: %[[VAL_6:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_7:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_8:.*]] = arith.subi %[[VAL_3]]#1, %[[VAL_6]] : index
-! CHECK: %[[VAL_9:.*]] = fir.do_loop %[[VAL_10:.*]] = %[[VAL_7]] to %[[VAL_8]] step %[[VAL_6]] unordered iter_args(%[[VAL_11:.*]] = %[[VAL_4]]) -> (!fir.array<?xi32>) {
-! CHECK: %[[VAL_12:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_13:.*]] = arith.addi %[[VAL_10]], %[[VAL_12]] : index
-! CHECK: %[[VAL_14:.*]] = fir.array_coor %[[VAL_1]] %[[VAL_13]] : (!fir.box<!fir.array<?xi32>>, index) -> !fir.ref<i32>
-! CHECK: %[[VAL_15:.*]] = fir.call @_QPpure_func(%[[VAL_14]]) {{.*}}: (!fir.ref<i32>) -> i32
-! CHECK: %[[VAL_16:.*]] = arith.addi %[[VAL_5]], %[[VAL_15]] : i32
-! CHECK: %[[VAL_17:.*]] = fir.array_update %[[VAL_11]], %[[VAL_16]], %[[VAL_10]] : (!fir.array<?xi32>, i32, index) -> !fir.array<?xi32>
-! CHECK: fir.result %[[VAL_17]] : !fir.array<?xi32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_4]], %[[VAL_18:.*]] to %[[VAL_0]] : !fir.array<?xi32>, !fir.array<?xi32>, !fir.box<!fir.array<?xi32>>
-! CHECK: %[[VAL_19:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_20:.*]]:3 = fir.box_dims %[[VAL_0]], %[[VAL_19]] : (!fir.box<!fir.array<?xi32>>, index) -> (index, index, index)
-! CHECK: %[[VAL_21:.*]] = fir.array_load %[[VAL_0]] : (!fir.box<!fir.array<?xi32>>) -> !fir.array<?xi32>
-! CHECK: %[[VAL_22:.*]] = arith.constant 42 : i32
-! CHECK: %[[VAL_23:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_24:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_25:.*]] = arith.subi %[[VAL_20]]#1, %[[VAL_23]] : index
-! CHECK: %[[VAL_26:.*]] = fir.do_loop %[[VAL_27:.*]] = %[[VAL_24]] to %[[VAL_25]] step %[[VAL_23]] iter_args(%[[VAL_28:.*]] = %[[VAL_21]]) -> (!fir.array<?xi32>) {
-! CHECK: %[[VAL_29:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_30:.*]] = arith.addi %[[VAL_27]], %[[VAL_29]] : index
-! CHECK: %[[VAL_31:.*]] = fir.array_coor %[[VAL_1]] %[[VAL_30]] : (!fir.box<!fir.array<?xi32>>, index) -> !fir.ref<i32>
-! CHECK: %[[VAL_32:.*]] = fir.call @_QPimpure_func(%[[VAL_31]]) {{.*}}: (!fir.ref<i32>) -> i32
-! CHECK: %[[VAL_33:.*]] = arith.addi %[[VAL_22]], %[[VAL_32]] : i32
-! CHECK: %[[VAL_34:.*]] = fir.array_update %[[VAL_28]], %[[VAL_33]], %[[VAL_27]] : (!fir.array<?xi32>, i32, index) -> !fir.array<?xi32>
-! CHECK: fir.result %[[VAL_34]] : !fir.array<?xi32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_21]], %[[VAL_35:.*]] to %[[VAL_0]] : !fir.array<?xi32>, !fir.array<?xi32>, !fir.box<!fir.array<?xi32>>
-! CHECK: return
+! CHECK-SAME: %[[i:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}, %[[j:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) {
+! CHECK: %[[i_decl:.*]]:2 = hlfir.declare %[[i]]
+! CHECK: %[[j_decl:.*]]:2 = hlfir.declare %[[j]]
+! CHECK: hlfir.elemental {{.*}} unordered
+! CHECK: fir.call @_QPpure_func
+! CHECK: hlfir.assign
+
+! CHECK: hlfir.elemental {{.*}} : (!fir.shape<1>) -> !hlfir.expr<?xi32> {
+! CHECK-NOT: unordered
+! CHECK: fir.call @_QPimpure_func
+! CHECK: hlfir.assign
! CHECK: }
More information about the flang-commits
mailing list