Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flang] Accommodate module subprograms defined in the same module
The symbol table, name resolution, and semantic checks for module subprograms -- esp. for MODULE FUNCTION and MODULE SUBROUTINE, but also MODULE PROCEDURE -- essentially assumed that the subprogram would be defined in a submodule of the (sub)module containing its interface. However, it is conforming to instead declare a module subprogram in the *same* (sub)module as its interface, and we need to handle that case. Since this case involves two symbols in the same scope with the same name, the symbol table details for subprograms have been extended with a pointer to the original module interface, rather than relying on searching in scopes. Differential Revision: https://reviews.llvm.org/D120839
- Loading branch information
Showing
8 changed files
with
179 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
! RUN: %python %S/test_errors.py %s %flang_fc1 | ||
! Tests module procedures declared and defined in the same module. | ||
|
||
! These cases are correct. | ||
module m1 | ||
interface | ||
integer module function f1(x) | ||
real, intent(in) :: x | ||
end function | ||
integer module function f2(x) | ||
real, intent(in) :: x | ||
end function | ||
module function f3(x) result(res) | ||
integer :: res | ||
real, intent(in) :: x | ||
end function | ||
module function f4(x) result(res) | ||
integer :: res | ||
real, intent(in) :: x | ||
end function | ||
module subroutine s1 | ||
end subroutine | ||
pure module subroutine s2 | ||
end subroutine | ||
module subroutine s3 | ||
end subroutine | ||
end interface | ||
contains | ||
integer module function f1(x) | ||
real, intent(in) :: x | ||
f1 = x | ||
end function | ||
module procedure f2 | ||
f2 = x | ||
end procedure | ||
module function f3(x) result(res) | ||
integer :: res | ||
real, intent(in) :: x | ||
res = x | ||
end function | ||
module procedure f4 | ||
res = x | ||
end procedure | ||
module subroutine s1 | ||
end subroutine | ||
pure module subroutine s2 | ||
end subroutine | ||
module procedure s3 | ||
end procedure | ||
end module | ||
|
||
! Error cases | ||
|
||
module m2 | ||
interface | ||
integer module function f1(x) | ||
real, intent(in) :: x | ||
end function | ||
integer module function f2(x) | ||
real, intent(in) :: x | ||
end function | ||
module function f3(x) result(res) | ||
integer :: res | ||
real, intent(in) :: x | ||
end function | ||
module function f4(x) result(res) | ||
integer :: res | ||
real, intent(in) :: x | ||
end function | ||
module subroutine s1 | ||
end subroutine | ||
pure module subroutine s2 | ||
end subroutine | ||
end interface | ||
contains | ||
integer module function f1(x) | ||
!ERROR: Dummy argument 'x' has type INTEGER(4); the corresponding argument in the interface body has type REAL(4) | ||
integer, intent(in) :: x | ||
f1 = x | ||
end function | ||
!ERROR: 'notf2' was not declared a separate module procedure | ||
module procedure notf2 | ||
end procedure | ||
!ERROR: Return type of function 'f3' does not match return type of the corresponding interface body | ||
module function f3(x) result(res) | ||
real :: res | ||
real, intent(in) :: x | ||
res = x | ||
end function | ||
!ERROR: Module subroutine 'f4' was declared as a function in the corresponding interface body | ||
module subroutine f4 | ||
end subroutine | ||
!ERROR: Module function 's1' was declared as a subroutine in the corresponding interface body | ||
module function s1 | ||
end function | ||
!ERROR: Module subprogram 's2' and its corresponding interface body are not both PURE | ||
impure module subroutine s2 | ||
end subroutine | ||
end module |