Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flang/include/flang/Support/Fortran-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENUM_CLASS(LanguageFeature, BackslashEscapes, OldDebugLines,
PolymorphicActualAllocatableOrPointerToMonomorphicDummy, RelaxedPureDummy,
UndefinableAsynchronousOrVolatileActual, AutomaticInMainProgram, PrintCptr,
SavedLocalInSpecExpr, PrintNamelist, AssumedRankPassedToNonAssumedRank,
IgnoreIrrelevantAttributes, Unsigned)
IgnoreIrrelevantAttributes, Unsigned, ContiguousOkForSeqAssociation)

// Portability and suspicious usage warnings
ENUM_CLASS(UsageWarning, Portability, PointerToUndefinable,
Expand Down
36 changes: 27 additions & 9 deletions flang/lib/Semantics/check-call.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,20 +581,38 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,
"Polymorphic scalar may not be associated with a %s array"_err_en_US,
dummyName);
}
bool isOkBecauseContiguous{
context.IsEnabled(
common::LanguageFeature::ContiguousOkForSeqAssociation) &&
actualLastSymbol &&
evaluate::IsContiguous(*actualLastSymbol, foldingContext)};
if (actualIsArrayElement && actualLastSymbol &&
!evaluate::IsContiguous(*actualLastSymbol, foldingContext) &&
!dummy.ignoreTKR.test(common::IgnoreTKR::Contiguous)) {
if (IsPointer(*actualLastSymbol)) {
basicError = true;
messages.Say(
"Element of pointer array may not be associated with a %s array"_err_en_US,
dummyName);
if (isOkBecauseContiguous) {
context.Warn(
common::LanguageFeature::ContiguousOkForSeqAssociation,
messages.at(),
"Element of contiguous pointer array is accepted for storage sequence association"_port_en_US);
} else {
basicError = true;
messages.Say(
"Element of pointer array may not be associated with a %s array"_err_en_US,
dummyName);
}
} else if (IsAssumedShape(*actualLastSymbol) &&
!dummy.ignoreTKR.test(common::IgnoreTKR::Contiguous)) {
basicError = true;
messages.Say(
"Element of assumed-shape array may not be associated with a %s array"_err_en_US,
dummyName);
if (isOkBecauseContiguous) {
context.Warn(
common::LanguageFeature::ContiguousOkForSeqAssociation,
messages.at(),
"Element of contiguous assumed-shape array is accepted for storage sequence association"_port_en_US);
} else {
basicError = true;
messages.Say(
"Element of assumed-shape array may not be associated with a %s array"_err_en_US,
dummyName);
}
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions flang/test/Semantics/call44.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
! RUN: %python %S/test_errors.py %s %flang_fc1 -pedantic -Werror
subroutine assumedshape(normal, contig)
real normal(:)
real, contiguous :: contig(:)
!WARNING: If the procedure's interface were explicit, this reference would be in error
!BECAUSE: Element of assumed-shape array may not be associated with a dummy argument 'assumedsize=' array
call seqAssociate(normal(1))
!PORTABILITY: Element of contiguous assumed-shape array is accepted for storage sequence association
call seqAssociate(contig(1))
end
subroutine seqAssociate(assumedSize)
real assumedSize(*)
end