[flang-commits] [PATCH] D153465: [flang] Fix looping on LEN type parameter usage

[Peter Klausler via Phabricator via flang-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG73a0ae021ec6: [flang] Fix looping on LEN type parameter usage (authored by klausler).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D153465

Files:
  flang/include/flang/Evaluate/common.h
  flang/lib/Evaluate/fold-integer.cpp
  flang/test/Semantics/pdt01.f90


Index: flang/test/Semantics/pdt01.f90
===================================================================
--- /dev/null
+++ flang/test/Semantics/pdt01.f90
@@ -0,0 +1,16 @@
+! RUN: %python %S/test_errors.py %s %flang_fc1
+! Catch error instead of crashing with infinite recursion
+! when a LEN PDT from one type is being used to define a
+! LEN PDT in another type's instantiation.
+program main
+  type t1(lp)
+    integer, len :: lp
+  end type
+  type t2(lp)
+    integer, len :: lp
+    type(t1(lp)) :: c
+  end type
+  integer local
+  !ERROR: Invalid specification expression: reference to local entity 'local'
+  type(t2(local)) :: x
+end
Index: flang/lib/Evaluate/fold-integer.cpp
===================================================================
--- flang/lib/Evaluate/fold-integer.cpp
+++ flang/lib/Evaluate/fold-integer.cpp
@@ -1269,10 +1269,11 @@
     }
   } else {
     // A "bare" type parameter: replace with its value, if that's now known
-    // in a current derived type instantiation, for KIND type parameters.
+    // in a current derived type instantiation.
     if (const auto *pdt{context.pdtInstance()}) {
+      auto restorer{context.WithoutPDTInstance()}; // don't loop
       bool isLen{false};
-      if (const semantics::Scope * scope{context.pdtInstance()->scope()}) {
+      if (const semantics::Scope * scope{pdt->scope()}) {
         auto iter{scope->find(parameterName)};
         if (iter != scope->end()) {
           const Symbol &symbol{*iter->second};
Index: flang/include/flang/Evaluate/common.h
===================================================================
--- flang/include/flang/Evaluate/common.h
+++ flang/include/flang/Evaluate/common.h
@@ -260,6 +260,9 @@
       const semantics::DerivedTypeSpec &spec) {
     return common::ScopedSet(pdtInstance_, &spec);
   }
+  common::Restorer<const semantics::DerivedTypeSpec *> WithoutPDTInstance() {
+    return common::ScopedSet(pdtInstance_, nullptr);
+  }
 
 private:
   parser::ContextualMessages messages_;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153465.533593.patch
Type: text/x-patch
Size: 2006 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/flang-commits/attachments/20230622/162f47b2/attachment.bin>