https://github.com/tru updated https://github.com/llvm/llvm-project/pull/150292
>From 3db29aaee5519d55cfd8d57e6950b84123c30699 Mon Sep 17 00:00:00 2001
From: Carlos Seo <carlos....@linaro.org>
Date: Wed, 23 Jul 2025 11:17:29 -0300
Subject: [PATCH] [Flang] Fix a crash when equivalence and namelist statements
are used (#150081)
Check for equivalence when generating namelist descriptors in IO.cpp.
Fixes #124489
---
flang/lib/Lower/IO.cpp | 4 +++-
flang/test/Lower/equivalence-3.f | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 flang/test/Lower/equivalence-3.f
diff --git a/flang/lib/Lower/IO.cpp b/flang/lib/Lower/IO.cpp
index 63a612d7ead61..d64449373fca2 100644
--- a/flang/lib/Lower/IO.cpp
+++ b/flang/lib/Lower/IO.cpp
@@ -464,8 +464,10 @@ getNamelistGroup(Fortran::lower::AbstractConverter
&converter,
fir::BoxType boxTy =
fir::BoxType::get(fir::PointerType::get(converter.genType(s)));
auto descFunc = [&](fir::FirOpBuilder &b) {
+ bool couldBeInEquivalence =
+ Fortran::semantics::FindEquivalenceSet(s) != nullptr;
auto box = Fortran::lower::genInitialDataTarget(
- converter, loc, boxTy, *expr, /*couldBeInEquivalence=*/true);
+ converter, loc, boxTy, *expr, couldBeInEquivalence);
b.create<fir::HasValueOp>(loc, box);
};
builder.createGlobalConstant(loc, boxTy, mangleName, descFunc, linkOnce);
diff --git a/flang/test/Lower/equivalence-3.f b/flang/test/Lower/equivalence-3.f
new file mode 100644
index 0000000000000..19f8880189f0c
--- /dev/null
+++ b/flang/test/Lower/equivalence-3.f
@@ -0,0 +1,19 @@
+! RUN: bbc -emit-fir -o - %s | FileCheck %s
+
+ ! CHECK-LABEL: func @_QQmain
+ program main
+ real a1,a2
+ equivalence (a1,a2)
+ ! A fir.alloca should never appear in a global constant initialization.
+ ! CHECK: fir.global linkonce @_QFEx1.desc constant :
!fir.box<!fir.ptr<!fir.array<5xf64>>>
+ ! CHECK: arith.constant 5 : index
+ ! CHECK:fir.address_of(@_QFEx1) : !fir.ref<!fir.array<5xf64>>
+ ! CHECK: fir.shape %c5 : (index) -> !fir.shape<1>
+ ! CHECK: fir.declare %0(%1) {uniq_name = "_QFEx1"} :
(!fir.ref<!fir.array<5xf64>>, !fir.shape<1>) -> !fir.ref<!fir.array<5xf64>>
+ ! CHECK: fir.embox %2(%1) : (!fir.ref<!fir.array<5xf64>>, !fir.shape<1>) ->
!fir.box<!fir.array<5xf64>>
+ ! CHECK: fir.rebox %3 : (!fir.box<!fir.array<5xf64>>) ->
!fir.box<!fir.ptr<!fir.array<5xf64>>>
+ ! CHECK: fir.has_value %4 : !fir.box<!fir.ptr<!fir.array<5xf64>>>
+ real*8 x1(5)
+ namelist /y1/x1
+ read (5,y1)
+ end
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
