[PATCH] D85908: [flang] Fix assert on character literal substrings as arguments

[Pete Steinfeld via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG19d7cc2e8306: [flang] Fix assert on character literal substrings as arguments (authored by PeteSteinfeld).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D85908

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


Index: flang/test/Semantics/resolve49.f90
===================================================================
--- flang/test/Semantics/resolve49.f90
+++ flang/test/Semantics/resolve49.f90
@@ -11,6 +11,10 @@
 
 ! Test substring
 program p2
+  type t1(n1,n2)
+    integer,kind :: n1,n2
+    integer :: c2(iachar('ABCDEFGHIJ'(n1:n1)))
+  end type
   character :: a(10)
   character :: b(5)
   integer :: n
@@ -21,6 +25,7 @@
   a(n:7) = b
   a(n+3:) = b
   a(:n+2) = b
+  n = iachar(1_'ABCDEFGHIJ'(1:1))
 end
 
 ! Test pointer assignment with bounds
Index: flang/lib/Evaluate/variable.cpp
===================================================================
--- flang/lib/Evaluate/variable.cpp
+++ flang/lib/Evaluate/variable.cpp
@@ -562,10 +562,17 @@
 template <typename T>
 std::optional<DynamicType> Designator<T>::GetType() const {
   if constexpr (IsLengthlessIntrinsicType<Result>) {
-    return {Result::GetType()};
-  } else {
-    return DynamicType::From(GetLastSymbol());
+    return Result::GetType();
+  } else if (const Symbol * symbol{GetLastSymbol()}) {
+    return DynamicType::From(*symbol);
+  } else if constexpr (Result::category == TypeCategory::Character) {
+    if (const Substring * substring{std::get_if<Substring>(&u)}) {
+      const auto *parent{substring->GetParentIf<StaticDataObject::Pointer>()};
+      CHECK(parent);
+      return DynamicType{TypeCategory::Character, (*parent)->itemBytes()};
+    }
   }
+  return std::nullopt;
 }
 
 static NamedEntity AsNamedEntity(const SymbolVector &x) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D85908.285394.patch
Type: text/x-patch
Size: 1522 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200813/c90eb02d/attachment.bin>