There were several different ways of handling the option to f18 to find predefined modules: - test_errors.sh was created by cmake substituting FLANG_INTRINSIC_MODULES_DIR into test_errors.sh.in - some tests used the flang script which has the option built it - some tests used %f18_with_includes which was replaced by the path to f18 plus the -I option - some included -I../../include/flang in their run command To make this more consistent, change %f18 to include the -intrinsic-module-directory option and use it everywhere, including to replace %flang and %f18_with_includes. This requires changing all of the invocations of the test scripts to put %f18 at the end so that it can expand to more than one argument. This eliminates the need to generate test_errors.sh which means we don't need flang/test/Semantics/CMakeLists.txt or the %B substitution. That makes the test_errors.sh command like the others, replacing %B/test/Semantics/test_errors.sh with %S/test_errors.sh. Also remove the OPTIONS: functionality as custom options can be included in the RUN: command. And remove -I/../../include/flang as that is now always included. Differential Revision: https://reviews.llvm.org/D79634
91 lines
3.1 KiB
Fortran
91 lines
3.1 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
! C737 If EXTENDS appears and the type being defined has a potential
|
|
! subobject component of type EVENT_TYPE or LOCK_TYPE from the intrinsic
|
|
! module ISO_FORTRAN_ENV, its parent type shall be EVENT_TYPE or LOCK_TYPE
|
|
! or have a potential subobject component of type EVENT_TYPE or LOCK_TYPE.
|
|
module not_iso_fortran_env
|
|
type event_type
|
|
end type
|
|
|
|
type lock_type
|
|
end type
|
|
end module
|
|
|
|
subroutine C737_a()
|
|
use iso_fortran_env
|
|
|
|
type lockGrandParentType
|
|
type(lock_type) :: grandParentField
|
|
end type lockGrandParentType
|
|
|
|
type, extends(lockGrandParentType) :: lockParentType
|
|
real :: parentField
|
|
end type lockParentType
|
|
|
|
type eventParentType
|
|
type(event_type) :: parentField
|
|
end type eventParentType
|
|
|
|
type noLockParentType
|
|
end type noLockParentType
|
|
|
|
type, extends(lockParentType) :: goodChildType1
|
|
type(lock_type) :: childField
|
|
end type goodChildType1
|
|
|
|
type, extends(lockParentType) :: goodChildType2
|
|
type(event_type) :: childField
|
|
end type goodChildType2
|
|
|
|
type, extends(lock_type) :: goodChildType3
|
|
type(event_type) :: childField
|
|
end type goodChildType3
|
|
|
|
type, extends(event_type) :: goodChildType4
|
|
type(lock_type) :: childField
|
|
end type goodChildType4
|
|
|
|
!ERROR: Type 'badchildtype1' has an EVENT_TYPE or LOCK_TYPE component, so the type at the base of its type extension chain ('nolockparenttype') must either have an EVENT_TYPE or LOCK_TYPE component, or be EVENT_TYPE or LOCK_TYPE
|
|
type, extends(noLockParentType) :: badChildType1
|
|
type(lock_type) :: childField
|
|
end type badChildType1
|
|
|
|
!ERROR: Type 'badchildtype2' has an EVENT_TYPE or LOCK_TYPE component, so the type at the base of its type extension chain ('nolockparenttype') must either have an EVENT_TYPE or LOCK_TYPE component, or be EVENT_TYPE or LOCK_TYPE
|
|
type, extends(noLockParentType) :: badChildType2
|
|
type(event_type) :: childField
|
|
end type badChildType2
|
|
|
|
!ERROR: Type 'badchildtype3' has an EVENT_TYPE or LOCK_TYPE component, so the type at the base of its type extension chain ('nolockparenttype') must either have an EVENT_TYPE or LOCK_TYPE component, or be EVENT_TYPE or LOCK_TYPE
|
|
type, extends(noLockParentType) :: badChildType3
|
|
type(lockParentType) :: childField
|
|
end type badChildType3
|
|
|
|
!ERROR: Type 'badchildtype4' has an EVENT_TYPE or LOCK_TYPE component, so the type at the base of its type extension chain ('nolockparenttype') must either have an EVENT_TYPE or LOCK_TYPE component, or be EVENT_TYPE or LOCK_TYPE
|
|
type, extends(noLockParentType) :: badChildType4
|
|
type(eventParentType) :: childField
|
|
end type badChildType4
|
|
|
|
end subroutine C737_a
|
|
|
|
subroutine C737_b()
|
|
use not_iso_fortran_env
|
|
|
|
type lockParentType
|
|
type(lock_type) :: parentField
|
|
end type lockParentType
|
|
|
|
type noLockParentType
|
|
end type noLockParentType
|
|
|
|
! actually OK since this is not the predefined lock_type
|
|
type, extends(noLockParentType) :: notBadChildType1
|
|
type(lock_type) :: childField
|
|
end type notBadChildType1
|
|
|
|
! actually OK since this is not the predefined event_type
|
|
type, extends(noLockParentType) :: notBadChildType2
|
|
type(event_type) :: childField
|
|
end type notBadChildType2
|
|
|
|
end subroutine C737_b
|