Skip to content
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

[flang] Prioritize DATA object error messages a little better #66258

Merged
merged 1 commit into from
Sep 18, 2023
Merged

[flang] Prioritize DATA object error messages a little better #66258

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: 13 additions & 10 deletions flang/lib/Semantics/check-data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,24 @@ class DataVarChecker : public evaluate::AllTraverse<DataVarChecker, true> {
const Scope &scope{context_.FindScope(source_)};
bool isFirstSymbol{isFirstSymbol_};
isFirstSymbol_ = false;
if (const char *whyNot{IsAutomatic(symbol) ? "Automatic variable"
: IsDummy(symbol) ? "Dummy argument"
: IsFunctionResult(symbol) ? "Function result"
: IsAllocatable(symbol) ? "Allocatable"
// Ordered so that most egregious errors are first
if (const char *whyNot{IsProcedure(symbol) && !IsPointer(symbol)
? "Procedure"
: isFirstSymbol && IsHostAssociated(symbol, scope)
? "Host-associated object"
: isFirstSymbol && IsUseAssociated(symbol, scope)
? "USE-associated object"
: IsDummy(symbol) ? "Dummy argument"
: IsFunctionResult(symbol) ? "Function result"
: IsAutomatic(symbol) ? "Automatic variable"
: IsAllocatable(symbol) ? "Allocatable"
: IsInitialized(symbol, true /*ignore DATA*/,
true /*ignore allocatable components*/,
true /*ignore uninitialized pointer components*/)
? "Default-initialized"
: IsProcedure(symbol) && !IsPointer(symbol) ? "Procedure"
// remaining checks don't apply to components
: !isFirstSymbol ? nullptr
: IsHostAssociated(symbol, scope) ? "Host-associated object"
: IsUseAssociated(symbol, scope) ? "USE-associated object"
: symbol.has<AssocEntityDetails>() ? "Construct association"
: IsPointer(symbol) && (hasComponent_ || hasSubscript_)
: isFirstSymbol && IsPointer(symbol) &&
(hasComponent_ || hasSubscript_)
? "Target of pointer"
: nullptr}) {
context_.Say(source_,
Expand Down
59 changes: 59 additions & 0 deletions flang/test/Semantics/data18.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
! RUN: %python %S/test_errors.py %s %flang_fc1
! Test error message priorities for DATA problems
module m
integer useAlloc
allocatable useAlloc
integer, pointer :: usePtr(:)
contains
subroutine useProc
end
end
function f(hostDummy, hostProc) result(hostResult)
integer hostDummy, hostResult
external hostProc
integer hostAuto(hostDummy)
integer, allocatable :: hostAlloc
integer :: hostInit = 1
integer, pointer :: hostPtr(:)
contains
subroutine test(innerDummy, innerProc)
use m
external innerProc
integer innerAuto(innerDummy)
integer, allocatable :: innerAlloc
integer :: innerInit = 1
integer, pointer :: innerPtr(:)
!ERROR: Procedure 'useproc' must not be initialized in a DATA statement
data useProc/0/
!ERROR: Procedure 'hostproc' must not be initialized in a DATA statement
data hostProc/0/
!ERROR: Procedure 'innerproc' must not be initialized in a DATA statement
data innerProc/0/
!ERROR: Host-associated object 'hostdummy' must not be initialized in a DATA statement
data hostDummy/1/
!ERROR: Host-associated object 'hostresult' must not be initialized in a DATA statement
data hostResult/1/
!ERROR: Host-associated object 'hostauto' must not be initialized in a DATA statement
data hostAuto/1/
!ERROR: Host-associated object 'hostalloc' must not be initialized in a DATA statement
data hostAlloc/1/
!ERROR: Host-associated object 'hostinit' must not be initialized in a DATA statement
data hostInit/1/
!ERROR: Host-associated object 'hostptr' must not be initialized in a DATA statement
data hostPtr(1)/1/
!ERROR: USE-associated object 'usealloc' must not be initialized in a DATA statement
data useAlloc/1/
!ERROR: USE-associated object 'useptr' must not be initialized in a DATA statement
data usePtr(1)/1/
!ERROR: Dummy argument 'innerdummy' must not be initialized in a DATA statement
data innerDummy/1/
!ERROR: Automatic variable 'innerauto' must not be initialized in a DATA statement
data innerAuto/1/
!ERROR: Allocatable 'inneralloc' must not be initialized in a DATA statement
data innerAlloc/1/
!ERROR: Default-initialized 'innerinit' must not be initialized in a DATA statement
data innerInit/1/
!ERROR: Target of pointer 'innerptr' must not be initialized in a DATA statement
data innerptr(1)/1/
end
end