[llvm-branch-commits] [flang] release/19.x: [flang] fix C_PTR function result lowering (#100082) (PR #100324)
https://github.com/pawosm-arm approved this pull request. Tested it with a real life app. https://github.com/llvm/llvm-project/pull/100324 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [flang] release/19.x: [Flang][Driver] Enable config file options (#100343) (PR #100541)
https://github.com/pawosm-arm approved this pull request. https://github.com/llvm/llvm-project/pull/100541 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] release/19.x: [AArch64] Add invalid 1 x vscale costs for reductions and reduction-operations. (#102105) (PR #102641)
https://github.com/pawosm-arm approved this pull request. https://github.com/llvm/llvm-project/pull/102641 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] release/20.x: [flang] Fix missed case of symbol renaming in module file generation (#132475) (PR #133223)
pawosm-arm wrote: Considering importance of CP2K in the Fortran world, I'd suggest cherry-picking it to the LLVM20 release branch. https://github.com/llvm/llvm-project/pull/133223 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [LV] An attempt to cherry-pick the fix PR #132691 (cherry-pick from the main branch to the release/20.x branch) (PR #135231)
https://github.com/pawosm-arm edited https://github.com/llvm/llvm-project/pull/135231 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [LV] An attempt to cherry-pick the fix PR #132691 (cherry-pick from the main branch to the release/20.x branch) (PR #135231)
https://github.com/pawosm-arm edited https://github.com/llvm/llvm-project/pull/135231 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] release/20.x: [flang] Fix missed case of symbol renaming in module file generation (#132475) (PR #133223)
pawosm-arm wrote: > @pawosm-arm Are you sure you are looking at the right PR? > [bug132435.f90](https://github.com/llvm/llvm-project/pull/133223/files#diff-1dda1d7a51b9f84047cb87bf94f9ac6aa4244f2b6ddf9b4513bb2c613b2e3c03) > is in the list of changed files. You got me. I was thinking about other thing I'm currently working on and in my mind everything messed up. Sorry for the confusion I caused. I'm not in a position to fix this, so I guess the best resolution would be to close this one. https://github.com/llvm/llvm-project/pull/133223 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] release/20.x: [flang] Fix missed case of symbol renaming in module file generation (#132475) (PR #133223)
pawosm-arm wrote: > It looks like the test from this patch is failing. I need some help with pinpointing that. Locally I can't reproduce any test failing either with this patch or because of this patch. Also I can't see any piece of log confirming that any test case from this patch (`clang/test/Driver/fveclib.c`, `flang/test/Driver/fveclib.f90`) couldn't pass. I can only see a report that the `Flang.Semantics/bug132435.f90` test is failing on both Windows and Linux. I looked into the `bug132435.f90` file and can't see anything even remotely related to my patch. I can assume that the reason for this failure lies beyond my commit and any other commit would suffer from the same failure. https://github.com/llvm/llvm-project/pull/133223 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [LV] An attempt to cherry-pick the fix PR #132691 (cherry-pick from the main branch to the release/20.x branch) (PR #135231)
pawosm-arm wrote: Thanks @fhahn for your comment and your patch. It is a good reason for closing down this one. https://github.com/llvm/llvm-project/pull/135231 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [LV] An attempt to cherry-pick the fix PR #132691 (cherry-pick from the main branch to the release/20.x branch) (PR #135231)
https://github.com/pawosm-arm closed https://github.com/llvm/llvm-project/pull/135231 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] release/20.x: [libc++][test] extend XFAIL clauses to cover Amazon Linux too (#129377) (PR #129566)
pawosm-arm wrote: I can't merge it myself, it says `Cannot update this protected ref.` https://github.com/llvm/llvm-project/pull/129566 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [Driver] Temporarily probe aarch64-linux-gnu GCC installation (PR #102039)
pawosm-arm wrote: We're facing it again, with LLVM20 this time https://github.com/llvm/llvm-project/pull/102039 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] release/20.x: [libc++][test] extend -linux-gnu XFAIL to cover all of the -linux targets (#129140) (PR #129225)
https://github.com/pawosm-arm closed https://github.com/llvm/llvm-project/pull/129225 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] release/20.x: [libc++][test] extend -linux-gnu XFAIL to cover all of the -linux targets (#129140) (PR #129225)
pawosm-arm wrote: The android triple seems to be `aarch64-linux-android` not `aarch64-android-something` so if those tests indeed pass on Android, well see them passing 'unexpectedly'. I'm closing this one to avoid further confusion, I need to prepare something fresh instead. https://github.com/llvm/llvm-project/pull/129225 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [flang] release/20.x: [flang] Fix missed case of symbol renaming in module file generation (#132475) (PR #133223)
https://github.com/pawosm-arm updated
https://github.com/llvm/llvm-project/pull/133223
>From 78b0eb25e001071d7793bd8f253c3d2efc5cbf0a Mon Sep 17 00:00:00 2001
From: Peter Klausler
Date: Wed, 26 Mar 2025 12:09:38 -0700
Subject: [PATCH] [flang] Fix missed case of symbol renaming in module file
generation (#132475)
The map of symbols requiring new local aliases for USE association needs
to use the symbols' ultimate resolutions to avoid missing cases that can
arise in convoluted codes with lots of confusing renamings.
Fixes https://github.com/llvm/llvm-project/issues/132435.
(cherry picked from commit 6df27dd42d827a2468dcf4b4b1ee1a8e8af1a408)
---
flang/lib/Evaluate/formatting.cpp | 3 +-
flang/lib/Semantics/mod-file.cpp | 2 +-
flang/test/Semantics/bug132435.f90 | 85 ++
3 files changed, 88 insertions(+), 2 deletions(-)
create mode 100644 flang/test/Semantics/bug132435.f90
diff --git a/flang/lib/Evaluate/formatting.cpp
b/flang/lib/Evaluate/formatting.cpp
index f3a53c1f983df..cf0b43bc94c36 100644
--- a/flang/lib/Evaluate/formatting.cpp
+++ b/flang/lib/Evaluate/formatting.cpp
@@ -129,7 +129,8 @@ llvm::raw_ostream &Constant>::AsFortran(
llvm::raw_ostream &EmitVar(llvm::raw_ostream &o, const Symbol &symbol,
std::optional name = std::nullopt) {
const auto &renamings{symbol.owner().context().moduleFileOutputRenamings()};
- if (auto iter{renamings.find(&symbol)}; iter != renamings.end()) {
+ if (auto iter{renamings.find(&symbol.GetUltimate())};
+ iter != renamings.end()) {
return o << iter->second.ToString();
} else if (name) {
return o << name->ToString();
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index b45f1c060da2f..ea3eae8468b50 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -346,7 +346,7 @@ void ModFileWriter::PrepareRenamings(const Scope &scope) {
uses_ << DEREF(sMod->symbol()).name() << ",only:";
if (rename != s->name()) {
uses_ << rename << "=>";
- renamings.emplace(&*s, rename);
+ renamings.emplace(&s->GetUltimate(), rename);
}
uses_ << s->name() << '\n';
useExtraAttrs_ << "private::" << rename << '\n';
diff --git a/flang/test/Semantics/bug132435.f90
b/flang/test/Semantics/bug132435.f90
new file mode 100644
index 0..be8b661fcf6cc
--- /dev/null
+++ b/flang/test/Semantics/bug132435.f90
@@ -0,0 +1,85 @@
+! RUN: %python %S/test_modfile.py %s %flang_fc1
+module m1
+ type foo
+integer :: c1 = 123
+ end type
+end
+
+module m2
+ use m1, only: foo
+ type baz
+type(foo) :: d = foo()
+ end type
+ type bar
+type(baz) :: e = baz()
+ end type
+end
+
+module m3
+ use m1, only: m1foo => foo
+ type foo
+type(m1foo), private :: c2 = m1foo()
+ end type
+end
+
+module m4
+ use m2, only: m3foo => foo
+ type foo
+type(m3foo), private :: c3 = m3foo()
+ end type
+end
+
+module m5
+ use m2, only: m2bar => bar
+ use m4, only: foo
+ type blah
+type(m2bar) :: f = m2bar()
+ end type
+end
+
+!Expect: m1.mod
+!module m1
+!type::foo
+!integer(4)::c1=123_4
+!end type
+!end
+
+!Expect: m2.mod
+!module m2
+!use m1,only:foo
+!type::baz
+!type(foo)::d=foo(c1=123_4)
+!end type
+!type::bar
+!type(baz)::e=baz(d=foo(c1=123_4))
+!end type
+!end
+
+!Expect: m3.mod
+!module m3
+!use m1,only:m1foo=>foo
+!type::foo
+!type(m1foo),private::c2=m1foo(c1=123_4)
+!end type
+!end
+
+!Expect: m4.mod
+!module m4
+!use m2,only:m3foo=>foo
+!type::foo
+!type(m3foo),private::c3=m3foo(c1=123_4)
+!end type
+!end
+
+!Expect: m5.mod
+!module m5
+!use m2,only:m2$foo=>foo
+!use m2,only:baz
+!use m2,only:m2bar=>bar
+!use m4,only:foo
+!private::m2$foo
+!private::baz
+!type::blah
+!type(m2bar)::f=m2bar(e=baz(d=m2$foo(c1=123_4)))
+!end type
+!end
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
