[PATCH] D82903: [flang] Bug fix for ambiguous references to data and functions

[Pete Steinfeld via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGf9e24a563c36: [flang] Bug fix for ambiguous references to data and functions (authored by PeteSteinfeld).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D82903/new/

https://reviews.llvm.org/D82903

Files:
  flang/lib/Semantics/expression.cpp
  flang/lib/Semantics/resolve-names.cpp
  flang/test/Semantics/resolve93.f90


Index: flang/test/Semantics/resolve93.f90
===================================================================
--- /dev/null
+++ flang/test/Semantics/resolve93.f90
@@ -0,0 +1,44 @@
+! RUN: %S/test_errors.sh %s %t %f18
+subroutine s1()
+  character(10) str
+  character(10) str1
+  !ERROR: Cannot reference function 'str' as data
+  print *, str(1:9), str(7)
+  block
+    character(10) str2
+    character(10) str3
+    !ERROR: Cannot reference function 'str1' as data
+    print *, str1(1:9), str1(7)
+    !ERROR: 'str2' is not an array
+    print *, str2(1:9), str2(7)
+    !ERROR: Cannot reference function 'str3' as data
+    print *, str3(7), str3(1:9)
+  end block
+end subroutine s1
+
+subroutine s2()
+  character(10) func
+  !ERROR: Cannot reference function 'func' as data
+  print *, func(7), func(1:9)
+end subroutine s2
+
+subroutine s3()
+  real(8) :: func
+  !ERROR: Cannot reference function 'func' as data
+  print *, func(7), func(1:6)
+end subroutine s3
+
+subroutine s4()
+  real(8) :: local
+  real(8) :: local1
+  !ERROR: Cannot reference function 'local' as data
+  print *, local(1:6), local(7)
+  !ERROR: Cannot reference function 'local1' as data
+  print *, local1(7), local1(1:6)
+end subroutine s4
+
+subroutine s5(arg)
+  integer :: iVar
+  external :: arg
+  iVar = loc(arg)
+end subroutine s5
Index: flang/lib/Semantics/resolve-names.cpp
===================================================================
--- flang/lib/Semantics/resolve-names.cpp
+++ flang/lib/Semantics/resolve-names.cpp
@@ -5505,7 +5505,15 @@
           },
           [&](const Indirection<parser::ArrayElement> &y) {
             Walk(y.value().subscripts);
-            return ResolveDataRef(y.value().base);
+            const parser::Name *name{ResolveDataRef(y.value().base)};
+            if (!name) {
+            } else if (!name->symbol->has<ProcEntityDetails>()) {
+              ConvertToObjectEntity(*name->symbol);
+            } else if (!context().HasError(*name->symbol)) {
+              SayWithDecl(*name, *name->symbol,
+                  "Cannot reference function '%s' as data"_err_en_US);
+            }
+            return name;
           },
           [&](const Indirection<parser::CoindexedNamedObject> &y) {
             Walk(y.value().imageSelector);
Index: flang/lib/Semantics/expression.cpp
===================================================================
--- flang/lib/Semantics/expression.cpp
+++ flang/lib/Semantics/expression.cpp
@@ -909,7 +909,10 @@
       return std::nullopt;
     } else if (baseExpr->Rank() == 0) {
       if (const Symbol * symbol{GetLastSymbol(*baseExpr)}) {
-        Say("'%s' is not an array"_err_en_US, symbol->name());
+        if (!context_.HasError(symbol)) {
+          Say("'%s' is not an array"_err_en_US, symbol->name());
+          context_.SetError(const_cast<Symbol &>(*symbol));
+        }
       }
     } else if (std::optional<DataRef> dataRef{
                    ExtractDataRef(std::move(*baseExpr))}) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D82903.275774.patch
Type: text/x-patch
Size: 2983 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200706/9c81287b/attachment.bin>