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
107 lines
2.6 KiB
Fortran
107 lines
2.6 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
!C1129
|
|
!A variable that is referenced by the scalar-mask-expr of a
|
|
!concurrent-header or by any concurrent-limit or concurrent-step in that
|
|
!concurrent-header shall not appear in a LOCAL locality-spec in the same DO
|
|
!CONCURRENT statement.
|
|
|
|
subroutine s1()
|
|
|
|
!ERROR: 'i' is already declared in this scoping unit
|
|
do concurrent (i=1:10) local(i)
|
|
end do
|
|
end subroutine s1
|
|
|
|
subroutine s2()
|
|
!ERROR: 'i' is already declared in this scoping unit
|
|
do concurrent (i=1:10) local_init(i)
|
|
end do
|
|
end subroutine s2
|
|
|
|
subroutine s4()
|
|
!ERROR: DO CONCURRENT expression references variable 'i' in LOCAL locality-spec
|
|
do concurrent (j=i:10) local(i)
|
|
end do
|
|
end subroutine s4
|
|
|
|
subroutine s5()
|
|
!OK because the locality-spec is local_init
|
|
do concurrent (j=i:10) local_init(i)
|
|
end do
|
|
end subroutine s5
|
|
|
|
subroutine s6()
|
|
!OK because the locality-spec is shared
|
|
do concurrent (j=i:10) shared(i)
|
|
end do
|
|
end subroutine s6
|
|
|
|
subroutine s7()
|
|
!ERROR: DO CONCURRENT expression references variable 'i' in LOCAL locality-spec
|
|
do concurrent (j=1:i) local(i)
|
|
end do
|
|
end subroutine s7
|
|
|
|
subroutine s8()
|
|
!OK because the locality-spec is local_init
|
|
do concurrent (j=1:i) local_init(i)
|
|
end do
|
|
end subroutine s8
|
|
|
|
subroutine s9()
|
|
!OK because the locality-spec is shared
|
|
do concurrent (j=1:i) shared(i)
|
|
end do
|
|
end subroutine s9
|
|
|
|
subroutine s10()
|
|
!ERROR: DO CONCURRENT expression references variable 'i' in LOCAL locality-spec
|
|
do concurrent (j=1:10:i) local(i)
|
|
end do
|
|
end subroutine s10
|
|
|
|
subroutine s11()
|
|
!OK because the locality-spec is local_init
|
|
do concurrent (j=1:10:i) local_init(i)
|
|
end do
|
|
end subroutine s11
|
|
|
|
subroutine s12()
|
|
!OK because the locality-spec is shared
|
|
do concurrent (j=1:10:i) shared(i)
|
|
end do
|
|
end subroutine s12
|
|
|
|
subroutine s13()
|
|
! Test construct-association, in this case, established by the "shared"
|
|
integer :: ivar
|
|
associate (avar => ivar)
|
|
!ERROR: DO CONCURRENT expression references variable 'ivar' in LOCAL locality-spec
|
|
do concurrent (j=1:10:avar) local(avar)
|
|
end do
|
|
end associate
|
|
end subroutine s13
|
|
|
|
module m1
|
|
integer :: mvar
|
|
end module m1
|
|
subroutine s14()
|
|
! Test use-association, in this case, established by the "shared"
|
|
use m1
|
|
|
|
!ERROR: DO CONCURRENT expression references variable 'mvar' in LOCAL locality-spec
|
|
do concurrent (k=mvar:10) local(mvar)
|
|
end do
|
|
end subroutine s14
|
|
|
|
subroutine s15()
|
|
! Test host-association, in this case, established by the "shared"
|
|
! locality-spec
|
|
ivar = 3
|
|
do concurrent (j=ivar:10) shared(ivar)
|
|
!ERROR: DO CONCURRENT expression references variable 'ivar' in LOCAL locality-spec
|
|
do concurrent (k=ivar:10) local(ivar)
|
|
end do
|
|
end do
|
|
end subroutine s15
|