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
71 lines
2.3 KiB
Fortran
71 lines
2.3 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
! C1167 -- An exit-stmt shall not appear within a DO CONCURRENT construct if
|
|
! it belongs to that construct or an outer construct.
|
|
|
|
subroutine do_concurrent_test1(n)
|
|
implicit none
|
|
integer :: i1,i2,i3,i4,i5,i6,n
|
|
mytest1: if (n>0) then
|
|
nc1: do concurrent(i1=1:n)
|
|
nc2: do i2=1,n
|
|
nc3: do concurrent(i3=1:n)
|
|
nc4: do i4=1,n
|
|
nc5: do concurrent(i5=1:n)
|
|
nc6: do i6=1,n
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
if (i6==10) exit mytest1
|
|
end do nc6
|
|
end do nc5
|
|
end do nc4
|
|
end do nc3
|
|
end do nc2
|
|
end do nc1
|
|
end if mytest1
|
|
end subroutine do_concurrent_test1
|
|
|
|
subroutine do_concurrent_test2(n)
|
|
implicit none
|
|
integer :: i1,i2,i3,i4,i5,i6,n
|
|
mytest2: if (n>0) then
|
|
nc1: do concurrent(i1=1:n)
|
|
nc2: do i2=1,n
|
|
nc3: do concurrent(i3=1:n)
|
|
nc4: do i4=1,n
|
|
nc5: do concurrent(i5=1:n)
|
|
nc6: do i6=1,n
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
if (i6==10) exit nc3
|
|
end do nc6
|
|
end do nc5
|
|
end do nc4
|
|
end do nc3
|
|
end do nc2
|
|
end do nc1
|
|
end if mytest2
|
|
end subroutine do_concurrent_test2
|
|
|
|
subroutine do_concurrent_test3(n)
|
|
implicit none
|
|
integer :: i1,i2,i3,i4,i5,i6,n
|
|
mytest3: if (n>0) then
|
|
nc1: do concurrent(i1=1:n)
|
|
nc2: do i2=1,n
|
|
nc3: do concurrent(i3=1:n)
|
|
!ERROR: EXIT must not leave a DO CONCURRENT statement
|
|
if (i3==4) exit nc2
|
|
nc4: do i4=1,n
|
|
nc5: do concurrent(i5=1:n)
|
|
nc6: do i6=1,n
|
|
if (i6==10) print *, "hello"
|
|
end do nc6
|
|
end do nc5
|
|
end do nc4
|
|
end do nc3
|
|
end do nc2
|
|
end do nc1
|
|
end if mytest3
|
|
end subroutine do_concurrent_test3
|