Make the self reference check in Lookup recursive (#8535)

Fixes #8521
OpenModelica · Feb 11, 2022 · 2638a98 · 2638a98
1 parent 5fd3b21
commit 2638a98
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFLookup.mo b/OMCompiler/Compiler/NFFrontEnd/NFLookup.mo
@@ -505,7 +505,7 @@ algorithm
       algorithm
         (node, state) := lookupFirstIdent(name.name, scope);
       then
-        lookupLocalName(name.path, node, state, context, checkAccessViolations, InstNode.refEqual(node, scope));
+        lookupLocalName(name.path, node, state, context, checkAccessViolations, isSelfReference(node, scope));
 
     // Fully qualified path, start from top scope.
     case Absyn.Path.FULLYQUALIFIED()
@@ -514,6 +514,25 @@ algorithm
   end match;
 end lookupName;
 
+function isSelfReference
+  input InstNode node;
+  input InstNode scope;
+  output Boolean res;
+protected
+  InstNode parent = scope;
+algorithm
+  while not InstNode.isEmpty(parent) loop
+    if InstNode.refEqual(node, parent) then
+      res := true;
+      return;
+    end if;
+
+    parent := InstNode.instanceParent(parent);
+  end while;
+
+  res := false;
+end isSelfReference;
+
 function lookupNames
   input Absyn.Path name;
   input InstNode scope;
@@ -538,7 +557,7 @@ algorithm
       algorithm
         (node, state) := lookupFirstIdent(name.name, scope);
       then
-        lookupLocalNames(name.path, node, {node}, state, context, InstNode.refEqual(node, scope));
+        lookupLocalNames(name.path, node, {node}, state, context, isSelfReference(node, scope));
 
     // Fully qualified path, start from top scope.
     case Absyn.Path.FULLYQUALIFIED()

diff --git a/testsuite/flattening/modelica/scodeinst/Makefile b/testsuite/flattening/modelica/scodeinst/Makefile
@@ -897,6 +897,7 @@ RecursiveConstants1.mo \
 RecursiveExtends1.mo \
 RecursiveExtends2.mo \
 RecursiveExtends3.mo \
+RecursiveExtends4.mo \
 RecursiveInst1.mo \
 RecursiveInst2.mo \
 RecursiveInst3.mo \

diff --git a/testsuite/flattening/modelica/scodeinst/RecursiveExtends4.mo b/testsuite/flattening/modelica/scodeinst/RecursiveExtends4.mo
@@ -0,0 +1,22 @@
+// name: RecursiveExtends4
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+// Checks that the compiler catches recursive extends.
+//
+
+model RecursiveExtends4
+  extends RecursiveExtends4.A.Icon1;
+
+  model A
+    extends RecursiveExtends4.A.Icon1;
+
+    partial class Icon1 end Icon1;
+  end A;
+end RecursiveExtends4;
+
+// Result:
+// class RecursiveExtends4
+// end RecursiveExtends4;
+// endResult