[PATCH] D99111: [flang] Disallow erroneous procedure declarations
Pete Steinfeld via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 22 14:35:07 PDT 2021
PeteSteinfeld created this revision.
PeteSteinfeld added reviewers: klausler, tskeith.
PeteSteinfeld requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
When writing tests for a previous problem, I ran across situations where we
were not producing error messages for declarations of specific procedures of
generic interfaces where every other compiler I tested (except nvfotran) did.
I added a check to CheckExtantExternal() and renamed it since it now checks for
erroneous extant symbols generally.
I also removed a call to this function from processing for ENTRY statements,
since it seemed unnecessary and its presence caused bogus error messages.
I also added some tests for erroneous declarations where we were not producing
error messages.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D99111
Files:
flang/lib/Semantics/resolve-names.cpp
flang/test/Semantics/resolve18.f90
Index: flang/test/Semantics/resolve18.f90
===================================================================
--- flang/test/Semantics/resolve18.f90
+++ flang/test/Semantics/resolve18.f90
@@ -94,3 +94,30 @@
use m5b
type(g) :: y
end
+
+module m6
+ real :: f6
+ interface g6
+ !ERROR: Procedure 'f6' was previously declared
+ real function f6()
+ end function f6
+ end interface g6
+end module m6
+
+module m7
+ integer :: f7
+ interface g7
+ !ERROR: Procedure 'f7' was previously declared
+ real function f7()
+ end function f7
+ end interface g7
+end module m7
+
+module m8
+ real :: f8
+ interface g8
+ !ERROR: Procedure 'f8' was previously declared
+ subroutine f8()
+ end subroutine f8
+ end interface g8
+end module m8
Index: flang/lib/Semantics/resolve-names.cpp
===================================================================
--- flang/lib/Semantics/resolve-names.cpp
+++ flang/lib/Semantics/resolve-names.cpp
@@ -745,7 +745,7 @@
} funcInfo_;
// Create a subprogram symbol in the current scope and push a new scope.
- void CheckExtantExternal(const parser::Name &, Symbol::Flag);
+ void CheckExtantProc(const parser::Name &, Symbol::Flag);
Symbol &PushSubprogramScope(const parser::Name &, Symbol::Flag);
Symbol *GetSpecificFromGeneric(const parser::Name &);
SubprogramDetails &PostSubprogramStmt(const parser::Name &);
@@ -3084,7 +3084,6 @@
Symbol::Flag subpFlag{
inFunction ? Symbol::Flag::Function : Symbol::Flag::Subroutine};
- CheckExtantExternal(name, subpFlag);
Scope &outer{inclusiveScope.parent()}; // global or module scope
if (Symbol * extant{FindSymbol(outer, name)}) {
if (extant->has<ProcEntityDetails>()) {
@@ -3176,7 +3175,7 @@
void SubprogramVisitor::EndSubprogram() { PopScope(); }
-void SubprogramVisitor::CheckExtantExternal(
+void SubprogramVisitor::CheckExtantProc(
const parser::Name &name, Symbol::Flag subpFlag) {
if (auto *prev{FindSymbol(name)}) {
if (prev->attrs().test(Attr::EXTERNAL) && prev->has<ProcEntityDetails>()) {
@@ -3189,6 +3188,11 @@
*prev, "Previous call of '%s'"_en_US);
}
EraseSymbol(name);
+ } else if (const auto *details{prev->detailsIf<EntityDetails>()}) {
+ if (!details->isDummy()) {
+ Say2(name, "Procedure '%s' was previously declared"_err_en_US, *prev,
+ "Previous declaration of '%s'"_en_US);
+ }
}
}
}
@@ -3197,7 +3201,7 @@
const parser::Name &name, Symbol::Flag subpFlag) {
auto *symbol{GetSpecificFromGeneric(name)};
if (!symbol) {
- CheckExtantExternal(name, subpFlag);
+ CheckExtantProc(name, subpFlag);
symbol = &MakeSymbol(name, SubprogramDetails{});
}
symbol->set(subpFlag);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D99111.332426.patch
Type: text/x-patch
Size: 2743 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210322/1742f121/attachment.bin>
More information about the llvm-commits
mailing list