AcoSail/llvm-project
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flang][runtime] Use Descriptor::Establish() in elemental derived type defined assignment calls

Browse Source 
The code in DoElementalDefinedAssignment() needs to establish its
to & from per-element descriptors with Establish() rather than
copying an array's descriptor and then setting its rank to zero;
the current technique loses the information in the addendum.

Differential Revision: https://reviews.llvm.org/D145753
This commit is contained in:
Peter Klausler 2023-03-08 14:45:18 -08:00
parent f19c46d431
commit 9c3550f69a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flang/runtime/assign.cpp
View File

@ -199,19 +199,17 @@ static void DoScalarDefinedAssignment(const Descriptor &to,
}
static void DoElementalDefinedAssignment(const Descriptor &to,
const Descriptor &from, const typeInfo::SpecialBinding &special) {
const Descriptor &from, const typeInfo::DerivedType &derived,
const typeInfo::SpecialBinding &special) {
SubscriptValue toAt[maxRank], fromAt[maxRank];
to.GetLowerBounds(toAt);
from.GetLowerBounds(fromAt);
StaticDescriptor<maxRank, true, 8 /*?*/> statDesc[2];
Descriptor &toElementDesc{statDesc[0].descriptor()};
Descriptor &fromElementDesc{statDesc[1].descriptor()};
toElementDesc = to;
toElementDesc.raw().attribute = CFI_attribute_pointer;
toElementDesc.raw().rank = 0;
fromElementDesc = from;
fromElementDesc.raw().attribute = CFI_attribute_pointer;
fromElementDesc.raw().rank = 0;
toElementDesc.Establish(derived, nullptr, 0, nullptr, CFI_attribute_pointer);
fromElementDesc.Establish(
derived, nullptr, 0, nullptr, CFI_attribute_pointer);
for (std::size_t toElements{to.Elements()}; toElements-- > 0;
to.IncrementSubscripts(toAt), from.IncrementSubscripts(fromAt)) {
toElementDesc.set_base_addr(to.Element<char>(toAt));
@ -268,7 +266,7 @@ static void Assign(
}
if (const auto *special{toDerived->FindSpecialBinding(
typeInfo::SpecialBinding::Which::ElementalAssignment)}) {
return DoElementalDefinedAssignment(to, from, *special);
return DoElementalDefinedAssignment(to, from, *toDerived, *special);
}
}
if ((flags & NeedFinalization) && toDerived->noFinalizationNeeded()) {