Skip to content

[flang] Make NULL() initializers explicit for allocatables in DATA co… #69753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2023

Conversation

klausler
Copy link
Contributor

…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.

@klausler klausler requested a review from jeanPerier October 20, 2023 19:11
@llvmbot llvmbot added flang Flang issues not falling into any other category flang:semantics labels Oct 20, 2023
@llvmbot
Copy link
Member

llvmbot commented Oct 20, 2023

@llvm/pr-subscribers-flang-semantics

Author: Peter Klausler (klausler)

Changes

…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.


Full diff: https://github.com/llvm/llvm-project/pull/69753.diff

2 Files Affected:

  • (modified) flang/lib/Evaluate/initial-image.cpp (+6-1)
  • (added) flang/test/Semantics/data19.f90 (+18)
diff --git a/flang/lib/Evaluate/initial-image.cpp b/flang/lib/Evaluate/initial-image.cpp
index a0fe4ec95da94d7..c2ced92aab00134 100644
--- a/flang/lib/Evaluate/initial-image.cpp
+++ b/flang/lib/Evaluate/initial-image.cpp
@@ -115,7 +115,12 @@ class AsConstantHelper {
                 typedValue[j].emplace(component, std::move(*value));
               }
             }
-          } 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)};
diff --git a/flang/test/Semantics/data19.f90 b/flang/test/Semantics/data19.f90
new file mode 100644
index 000000000000000..dea2350adbdaec6
--- /dev/null
+++ b/flang/test/Semantics/data19.f90
@@ -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

Copy link
Contributor

@jeanPerier jeanPerier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much!

…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.
@klausler klausler merged commit 4739c88 into llvm:main Oct 31, 2023
@klausler klausler deleted the bug1404 branch October 31, 2023 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flang:semantics flang Flang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants