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
76 lines
1.7 KiB
Fortran
76 lines
1.7 KiB
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Test declarations with coarray-spec
|
|
|
|
! Different ways of declaring the same coarray.
|
|
module m1
|
|
real :: a(1:5)[1:10,1:*]
|
|
real, dimension(5) :: b[1:10,1:*]
|
|
real, codimension[1:10,1:*] :: c(5)
|
|
real, codimension[1:10,1:*], dimension(5) :: d
|
|
codimension :: e[1:10,1:*]
|
|
dimension :: e(5)
|
|
real :: e
|
|
end
|
|
!Expect: m1.mod
|
|
!module m1
|
|
! real(4)::a(1_8:5_8)[1_8:10_8,1_8:*]
|
|
! real(4)::b(1_8:5_8)[1_8:10_8,1_8:*]
|
|
! real(4)::c(1_8:5_8)[1_8:10_8,1_8:*]
|
|
! real(4)::d(1_8:5_8)[1_8:10_8,1_8:*]
|
|
! real(4)::e(1_8:5_8)[1_8:10_8,1_8:*]
|
|
!end
|
|
|
|
! coarray-spec in codimension and target statements.
|
|
module m2
|
|
codimension :: a[10,*], b[*]
|
|
target :: c[10,*], d[*]
|
|
end
|
|
!Expect: m2.mod
|
|
!module m2
|
|
! real(4)::a[1_8:10_8,1_8:*]
|
|
! real(4)::b[1_8:*]
|
|
! real(4),target::c[1_8:10_8,1_8:*]
|
|
! real(4),target::d[1_8:*]
|
|
!end
|
|
|
|
! coarray-spec in components and with non-constants bounds
|
|
module m3
|
|
type t
|
|
real, allocatable :: c[:,:]
|
|
complex, allocatable, codimension[:,:] :: d
|
|
end type
|
|
real, allocatable :: e[:,:,:]
|
|
contains
|
|
subroutine s(a, b, n)
|
|
integer(8) :: n
|
|
real :: a[1:n,2:*]
|
|
real, codimension[1:n,2:*] :: b
|
|
end
|
|
end
|
|
!Expect: m3.mod
|
|
!module m3
|
|
! type::t
|
|
! real(4),allocatable::c[:,:]
|
|
! complex(4),allocatable::d[:,:]
|
|
! end type
|
|
! real(4),allocatable::e[:,:,:]
|
|
!contains
|
|
! subroutine s(a,b,n)
|
|
! integer(8)::n
|
|
! real(4)::a[1_8:n,2_8:*]
|
|
! real(4)::b[1_8:n,2_8:*]
|
|
! end
|
|
!end
|
|
|
|
! coarray-spec in both attributes and entity-decl
|
|
module m4
|
|
real, codimension[2:*], dimension(2:5) :: a, b(4,4), c[10,*], d(4,4)[10,*]
|
|
end
|
|
!Expect: m4.mod
|
|
!module m4
|
|
! real(4)::a(2_8:5_8)[2_8:*]
|
|
! real(4)::b(1_8:4_8,1_8:4_8)[2_8:*]
|
|
! real(4)::c(2_8:5_8)[1_8:10_8,1_8:*]
|
|
! real(4)::d(1_8:4_8,1_8:4_8)[1_8:10_8,1_8:*]
|
|
!end
|