Skip to content

[flang] Allow nested scopes for implied DO loops with DATA statements #129410

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 6 commits into from
Mar 5, 2025
Merged

[flang] Allow nested scopes for implied DO loops with DATA statements #129410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
766a16b
[flang] Allow nested implied DO loops with DATA statements
eugeneepshteyn Feb 28, 2025
6858898
Merge branch 'llvm:main' into nested-impl-do-data
eugeneepshteyn Feb 28, 2025
ae9886a
Merge branch 'llvm:main' into nested-impl-do-data
eugeneepshteyn Feb 28, 2025
ba489ed
Don't create extra scode at the entry to DATA statement:
eugeneepshteyn Feb 28, 2025
7cbf3a3
Merge branch 'llvm:main' into nested-impl-do-data
eugeneepshteyn Mar 2, 2025
8525229
Updated Semantics/symbol09.f90 to pass with the new scope changes
eugeneepshteyn Mar 2, 2025
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
13 changes: 4 additions & 9 deletions flang/lib/Semantics/resolve-names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7477,15 +7477,10 @@ bool ConstructVisitor::Pre(const parser::DataImpliedDo &x) {
Walk(bounds.upper);
Walk(bounds.step);
EndCheckOnIndexUseInOwnBounds(restore);
bool pushScope{currScope().kind() != Scope::Kind::ImpliedDos};
if (pushScope) {
PushScope(Scope::Kind::ImpliedDos, nullptr);
}
PushScope(Scope::Kind::ImpliedDos, nullptr);
DeclareStatementEntity(bounds.name, type);
Walk(objects);
if (pushScope) {
PopScope();
}
PopScope();
return false;
}

Expand Down Expand Up @@ -7526,9 +7521,9 @@ bool ConstructVisitor::Pre(const parser::DataStmtObject &x) {
}
},
[&](const parser::DataImpliedDo &y) {
PushScope(Scope::Kind::ImpliedDos, nullptr);
// Don't push scope here, since it's done when visiting
// DataImpliedDo.
Walk(y);
PopScope();
},
},
x.u);
Expand Down
4 changes: 2 additions & 2 deletions flang/test/Semantics/resolve40.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ subroutine s8

subroutine s9
real :: x(2,2)
!ERROR: 'i' is already declared in this scoping unit
data ((x(i,i),i=1,2),i=1,2)/4*0.0/
! Nested implied DO loops have their own scope
data ((x(i,j),j=1,2),(x(i,j),j=1,2),i=1,2)/8*0.0/
end

module m10
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Semantics/symbol09.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ subroutine s3
real, dimension(n,n) :: x
!REF: /s3/x
!DEF: /s3/ImpliedDos1/k (Implicit) ObjectEntity INTEGER(4)
!DEF: /s3/ImpliedDos1/j ObjectEntity INTEGER(8)
!DEF: /s3/ImpliedDos1/ImpliedDos1/j ObjectEntity INTEGER(8)
!REF: /s3/n
!REF: /s3/n2
data ((x(k,j),integer(kind=8)::j=1,n),k=1,n)/n2*3.0/
Expand Down