squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[flang] Duplicate names for ac-implied-do variables erroneously cause errors

Browse source 
According to section 19.4, paragraph 5, the scope of an ac-implied-do variable
is the enclosing ac-implied-do.  But we were not creating new scopes upon
entry to an ac-implied-do.  This was causing error messages to be erroneously
emitted.

I fixed, the code, added a test to array-constr-values.f90, added the test
folding15.f90 and corrected the test symbol05.f90.

Differential Revision: https://reviews.llvm.org/D91560
This commit is contained in:
Peter Steinfeld 2020-11-16 12:06:44 -08:00
parent 3f4b5893ef
commit 681978d3b4
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flang/lib/Semantics/resolve-names.cpp
View file

@ -4995,14 +4995,18 @@ bool ConstructVisitor::Pre(const parser::AcSpec &x) {
return false;
}
// Section 19.4, paragraph 5 says that each ac-do-variable has the scope of the
// enclosing ac-implied-do
bool ConstructVisitor::Pre(const parser::AcImpliedDo &x) {
auto &values{std::get<std::list<parser::AcValue>>(x.t)};
auto &control{std::get<parser::AcImpliedDoControl>(x.t)};
auto &type{std::get<std::optional<parser::IntegerTypeSpec>>(control.t)};
auto &bounds{std::get<parser::AcImpliedDoControl::Bounds>(control.t)};
PushScope(Scope::Kind::ImpliedDos, nullptr);
DeclareStatementEntity(bounds.name.thing.thing, type);
Walk(bounds);
Walk(values);
PopScope();
return false;
}

11
flang/test/Evaluate/folding15.f90 Normal file
View file

@ -0,0 +1,11 @@
! RUN: %S/test_folding.sh %s %t %f18
! Test folding of array constructors with duplicate names for the implied
! DO variables
module m1
integer, parameter :: expected(12) = [1, 2, 4, 6, 1, 2, 4, 6, 1, 2, 3, 6]
integer, parameter :: dups(12) = &
[ ((iDuplicate, iDuplicate = 1,j), &
(2 * iDuplicate, iDuplicate = j,3 ), &
j = 1,3 ) ]
logical, parameter :: test_dups = all(dups == expected)
end module

7
flang/test/Semantics/array-constr-values.f90
View file

@ -55,9 +55,14 @@ subroutine checkC7115()
real, dimension(10), parameter :: good1 = [(99.9, i = 1, 10)]
real, dimension(100), parameter :: good2 = [((88.8, i = 1, 10), j = 1, 10)]
!ERROR: Implied DO index is active in surrounding implied DO loop and may not have the same name
!ERROR: 'i' is already declared in this scoping unit
real, dimension(100), parameter :: bad = [((88.8, i = 1, 10), i = 1, 10)]
!ERROR: The stride of an implied DO loop must not be zero
integer, parameter :: bad2(*) = [(j, j=1,1,0)]
end subroutine checkC7115
subroutine checkOkDuplicates
real :: realArray(21) = &
[ ((1.0, iDuplicate = 1,j), &
(0.0, iDuplicate = j,3 ), &
j = 1,5 ) ]
end subroutine

4
flang/test/Semantics/symbol05.f90
View file

@ -48,10 +48,10 @@ subroutine s3
!DEF: /s3/Block1/t DerivedType
type :: t
!DEF: /s3/Block1/t/x ObjectEntity REAL(4)
!DEF: /s3/Block1/t/ImpliedDos1/i (Implicit) ObjectEntity INTEGER(4)
!DEF: /s3/Block1/t/ImpliedDos1/ImpliedDos1/i (Implicit) ObjectEntity INTEGER(4)
real :: x(10) = [(i, i=1,10)]
!DEF: /s3/Block1/t/y ObjectEntity REAL(4)
!DEF: /s3/Block1/t/ImpliedDos2/j ObjectEntity INTEGER(8)
!DEF: /s3/Block1/t/ImpliedDos2/ImpliedDos1/j ObjectEntity INTEGER(8)
real :: y(10) = [(j, j=1,10)]
end type
end block