Skip to content

[flang] Correct definability checking for INTENT(IN) pointers #74158

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.

Sign up for GitHub

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
Dec 11, 2023
Merged

[flang] Correct definability checking for INTENT(IN) pointers #74158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions flang/lib/Semantics/definable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ static const Symbol &GetRelevantSymbol(const evaluate::DataRef &dataRef,

// Check the leftmost (or only) symbol from a data-ref or expression.
static std::optional<parser::Message> WhyNotDefinableBase(parser::CharBlock at,
const Scope &scope, DefinabilityFlags flags, const Symbol &original) {
const Scope &scope, DefinabilityFlags flags, const Symbol &original,
bool isWholeSymbol) {
const Symbol &ultimate{original.GetUltimate()};
bool isPointerDefinition{flags.test(DefinabilityFlag::PointerDefinition)};
bool acceptAllocatable{flags.test(DefinabilityFlag::AcceptAllocatable)};
Expand All @@ -104,15 +105,17 @@ static std::optional<parser::Message> WhyNotDefinableBase(parser::CharBlock at,
} else if (auto dataRef{evaluate::ExtractDataRef(
*association->expr(), true, true)}) {
return WhyNotDefinableBase(at, scope, flags,
GetRelevantSymbol(*dataRef, isPointerDefinition, acceptAllocatable));
GetRelevantSymbol(*dataRef, isPointerDefinition, acceptAllocatable),
isWholeSymbol);
}
}
if (isTargetDefinition) {
} else if (!isPointerDefinition && !IsVariableName(ultimate)) {
return BlameSymbol(at, "'%s' is not a variable"_en_US, original);
} else if (IsProtected(ultimate) && IsUseAssociated(original, scope)) {
return BlameSymbol(at, "'%s' is protected in this scope"_en_US, original);
} else if (IsIntentIn(ultimate)) {
} else if (IsIntentIn(ultimate) &&
(!IsPointer(ultimate) || (isWholeSymbol && isPointerDefinition))) {
return BlameSymbol(
at, "'%s' is an INTENT(IN) dummy argument"_en_US, original);
}
Expand Down Expand Up @@ -165,6 +168,12 @@ static std::optional<parser::Message> WhyNotDefinableBase(parser::CharBlock at,
static std::optional<parser::Message> WhyNotDefinableLast(parser::CharBlock at,
const Scope &scope, DefinabilityFlags flags, const Symbol &original) {
const Symbol &ultimate{original.GetUltimate()};
if (const auto *association{ultimate.detailsIf<AssocEntityDetails>()}) {
if (auto dataRef{
evaluate::ExtractDataRef(*association->expr(), true, true)}) {
return WhyNotDefinableLast(at, scope, flags, dataRef->GetLastSymbol());
}
}
if (flags.test(DefinabilityFlag::PointerDefinition)) {
if (flags.test(DefinabilityFlag::AcceptAllocatable)) {
if (!IsAllocatableOrObjectPointer(&ultimate)) {
Expand Down Expand Up @@ -216,7 +225,8 @@ static std::optional<parser::Message> WhyNotDefinable(parser::CharBlock at,
const Symbol &base{GetRelevantSymbol(dataRef,
flags.test(DefinabilityFlag::PointerDefinition),
flags.test(DefinabilityFlag::AcceptAllocatable))};
if (auto whyNot{WhyNotDefinableBase(at, scope, flags, base)}) {
if (auto whyNot{WhyNotDefinableBase(at, scope, flags, base,
std::holds_alternative<evaluate::SymbolRef>(dataRef.u))}) {
return whyNot;
} else {
return WhyNotDefinableLast(at, scope, flags, dataRef.GetLastSymbol());
Expand All @@ -231,12 +241,13 @@ static std::optional<parser::Message> WhyNotDefinable(parser::CharBlock at,
const Symbol &base{GetRelevantSymbol(dataRef, false, false)};
DefinabilityFlags baseFlags{flags};
baseFlags.reset(DefinabilityFlag::PointerDefinition);
return WhyNotDefinableBase(at, scope, baseFlags, base);
return WhyNotDefinableBase(at, scope, baseFlags, base,
std::holds_alternative<evaluate::SymbolRef>(dataRef.u));
}

std::optional<parser::Message> WhyNotDefinable(parser::CharBlock at,
const Scope &scope, DefinabilityFlags flags, const Symbol &original) {
if (auto base{WhyNotDefinableBase(at, scope, flags, original)}) {
if (auto base{WhyNotDefinableBase(at, scope, flags, original, true)}) {
return base;
}
return WhyNotDefinableLast(at, scope, flags, original);
Expand Down
15 changes: 15 additions & 0 deletions flang/test/Semantics/definable01.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,19 @@ subroutine test3a(op)
subroutine test3b(pp)
procedure(sin), pointer, intent(in out) :: pp
end subroutine
subroutine test4(p)
type(ptype), pointer, intent(in) :: p
p%x = 1.
p%ptr = 1. ! ok
nullify(p%ptr) ! ok
!CHECK: error: 'p' may not appear in NULLIFY
!CHECK: because: 'p' is an INTENT(IN) dummy argument
nullify(p)
end
subroutine test5(np)
type(ptype), intent(in) :: np
!CHECK: error: 'ptr' may not appear in NULLIFY
!CHECK: because: 'np' is an INTENT(IN) dummy argument
nullify(np%ptr)
end
end module