[PATCH] D80593: [flang] Fixed crash on forward referenced `len` parameter

[Pete Steinfeld via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG1746c8ed2660: [flang] Fixed crash on forward referenced `len` parameter (authored by PeteSteinfeld).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D80593

Files:
  flang/lib/Evaluate/variable.cpp
  flang/test/Semantics/resolve91.f90


Index: flang/test/Semantics/resolve91.f90
===================================================================
--- flang/test/Semantics/resolve91.f90
+++ flang/test/Semantics/resolve91.f90
@@ -44,3 +44,10 @@
     real, dimension(:), pointer :: realArray => localArray
   end type
 end module m4
+
+module m5
+  !ERROR: Actual argument for 'string=' has bad type 'REAL(4)'
+  character(len=len(a)) :: b
+  !ERROR: The type of 'a' has already been implicitly declared
+  character(len=len(b)) :: a
+end module m5
Index: flang/lib/Evaluate/variable.cpp
===================================================================
--- flang/lib/Evaluate/variable.cpp
+++ flang/lib/Evaluate/variable.cpp
@@ -257,8 +257,14 @@
 static std::optional<Expr<SubscriptInteger>> SymbolLEN(const Symbol &sym) {
   if (auto dyType{DynamicType::From(sym)}) {
     if (const semantics::ParamValue * len{dyType->charLength()}) {
-      if (auto intExpr{len->GetExplicit()}) {
-        return ConvertToType<SubscriptInteger>(*std::move(intExpr));
+      if (len->isExplicit()) {
+        if (auto intExpr{len->GetExplicit()}) {
+          return ConvertToType<SubscriptInteger>(*std::move(intExpr));
+        } else {
+          // There was an error constructing this symbol's type.  It should
+          // have a length expression, but we couldn't retrieve it
+          return std::nullopt;
+        }
       } else {
         return Expr<SubscriptInteger>{
             DescriptorInquiry{NamedEntity{sym}, DescriptorInquiry::Field::Len}};


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80593.268574.patch
Type: text/x-patch
Size: 1515 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200604/3c97bac4/attachment.bin>