Skip to content

Commit

Permalink
[flang] Make NULL() initializers explicit for allocatables in DATA co… (
Browse files Browse the repository at this point in the history
#69753)

…nversion

As requested by people working on lowering: when semantics converts the
contents of DATA statements into explicit object initializers, ensure
that structure constructors for derived types contain explicit NULL()
values for their allocatable components.
  • Loading branch information
klausler committed Oct 31, 2023
1 parent b2bdc45 commit 4739c88
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
9 changes: 8 additions & 1 deletion flang/lib/Evaluate/initial-image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,16 @@ class AsConstantHelper {
for (std::size_t j{0}; j < elements; ++j, at += stride) {
if (Result value{image_.AsConstantPointer(at)}) {
typedValue[j].emplace(component, std::move(*value));
} else {
typedValue[j].emplace(component, Expr<SomeType>{NullPointer{}});
}
}
} else if (!IsAllocatable(component)) {
} else if (IsAllocatable(component)) {
// Lowering needs an explicit NULL() for allocatables
for (std::size_t j{0}; j < elements; ++j, at += stride) {
typedValue[j].emplace(component, Expr<SomeType>{NullPointer{}});
}
} else {
auto componentType{DynamicType::From(component)};
CHECK(componentType.has_value());
auto componentExtents{GetConstantExtents(context_, component)};
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Semantics/data19.f90
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
! RUN: %flang_fc1 -fdebug-dump-symbols %s 2>&1 | FileCheck %s
! Test truncation/padding in DATA statement.

program main
character(len=3) :: c1, c2, c3(2), c4(2)
data c1(1:2), c1(3:3) /'123', '4'/
data c2(1:2), c2(3:3) /'1', '2'/
Expand Down
18 changes: 18 additions & 0 deletions flang/test/Semantics/data20.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
! RUN: %flang_fc1 -fdebug-dump-symbols %s 2>&1 | FileCheck %s
! Verify that allocatable components have explicit NULL() initializers
! when converted from DATA statements
!CHECK: x1 (InDataStmt) size=32 offset=0: ObjectEntity type: TYPE(t) init:t(a=NULL(),n=1_4)
!CHECK: x2 (InDataStmt) size=64 offset=32: ObjectEntity type: TYPE(t) shape: 1_8:2_8 init:[t::t(a=NULL(),n=2_4),t(a=NULL(),n=3_4)]
!CHECK: x3 (InDataStmt) size=64 offset=96: ObjectEntity type: TYPE(t2) init:t2(b=[t::t(a=NULL(),n=4_4),t(a=NULL(),n=5_4)])
program main
type t
real, allocatable :: a
integer n
end type
type t2
type(t) b(2)
end type
type(t) x1, x2(2)
type(t2) x3
data x1%n/1/, x2(:)%n/2, 3/, x3%b(:)%n/4, 5/
end

0 comments on commit 4739c88

Please sign in to comment.