[flang] Use local name for structure constructor

[klausler]

When reinterpreting an ambiguously parsed function reference as a structure constructor, use the original symbol of the type in the representation of the derived type spec of the structure constructor, not its ultimate resolution. The distinction turns out to matter when generating module files containing derived type constants as initializers when the derived types' names have undergone USE association renaming.

Fixes #131579.

[llvmbot]

@llvm/pr-subscribers-flang-semantics

Author: Peter Klausler (klausler)

Changes

When reinterpreting an ambiguously parsed function reference as a structure constructor, use the original symbol of the type in the representation of the derived type spec of the structure constructor, not its ultimate resolution. The distinction turns out to matter when generating module files containing derived type constants as initializers when the derived types' names have undergone USE association renaming.

Fixes #131579.

---

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

2 Files Affected:

• (modified) flang/lib/Semantics/expression.cpp (+1-1)
• (added) flang/test/Semantics/bug131579.f90 (+58)

diff --git a/flang/lib/Semantics/expression.cpp b/flang/lib/Semantics/expression.cpp
index 39a58a4e23363..a04b8e55503e3 100644
--- a/flang/lib/Semantics/expression.cpp
+++ b/flang/lib/Semantics/expression.cpp
@@ -3260,7 +3260,7 @@ MaybeExpr ExpressionAnalyzer::Analyze(const parser::FunctionReference &funcRef,
       const auto &designator{std::get<parser::ProcedureDesignator>(call.t)};
       if (const auto *name{std::get_if<parser::Name>(&designator.u)}) {
         semantics::Scope &scope{context_.FindScope(name->source)};
-        semantics::DerivedTypeSpec dtSpec{name->source, symbol.GetUltimate()};
+        semantics::DerivedTypeSpec dtSpec{name->source, symbol};
         if (!CheckIsValidForwardReference(dtSpec)) {
           return std::nullopt;
         }
diff --git a/flang/test/Semantics/bug131579.f90 b/flang/test/Semantics/bug131579.f90
new file mode 100644
index 0000000000000..8a5c124612a99
--- /dev/null
+++ b/flang/test/Semantics/bug131579.f90
@@ -0,0 +1,58 @@
+! RUN: %python %S/test_modfile.py %s %flang_fc1
+MODULE M1
+    TYPE T1
+        REAL(KIND=4), DIMENSION(:, :), POINTER    :: ptr => Null()
+    END TYPE T1
+
+    TYPE O1
+        TYPE(T1), POINTER           :: d => Null()
+    END TYPE O1
+END MODULE
+
+!Expect: m1.mod
+!module m1
+!type::t1
+!real(4),pointer::ptr(:,:)=>NULL()
+!end type
+!intrinsic::null
+!type::o1
+!type(t1),pointer::d=>NULL()
+!end type
+!end
+
+MODULE M2
+    USE M1,only : &
+    o1_prv => o1
+
+    public
+    TYPE D1
+        TYPE(o1_prv), PRIVATE        :: prv = o1_prv ()
+    END TYPE D1
+END MODULE
+
+!Expect: m2.mod
+!module m2
+!use m1,only:o1_prv=>o1
+!type::d1
+!type(o1_prv),private::prv=o1_prv(d=NULL())
+!end type
+!end
+
+MODULE M3
+    USE M2 , only : d1_prv => D1
+
+    PUBLIC
+    TYPE d1_ext
+        TYPE(d1_prv), PRIVATE :: prv = d1_prv()
+    END TYPE
+END MODULE
+
+!Expect: m3.mod
+!module m3
+!use m2,only:o1_prv
+!use m2,only:d1_prv=>d1
+!private::o1_prv
+!type::d1_ext
+!type(d1_prv),private::prv=d1_prv(prv=o1_prv(d=NULL()))
+!end type
+!end