[NB] correctly lower array records (#10686)

OpenModelica · May 12, 2023 · 9d08b82 · 9d08b82
1 parent 997b5e0
commit 9d08b82
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/OMCompiler/Compiler/NBackEnd/Classes/NBackendDAE.mo b/OMCompiler/Compiler/NBackEnd/Classes/NBackendDAE.mo
@@ -539,6 +539,7 @@ protected
 
       // add children pointers for records afterwards
       case (_, _, Type.COMPLEX())                                     then BackendExtension.RECORD({});
+      case (_, _, _) guard(Type.isComplexArray(ty))                   then BackendExtension.RECORD({});
 
       case (NFPrefixes.Variability.CONTINUOUS, _, Type.BOOLEAN())     then BackendExtension.DISCRETE();
       case (NFPrefixes.Variability.CONTINUOUS, _, Type.INTEGER())     then BackendExtension.DISCRETE();

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFType.mo b/OMCompiler/Compiler/NFFrontEnd/NFType.mo
@@ -462,6 +462,17 @@ public
     end match;
   end isComplex;
 
+  function isComplexArray
+    input Type ty;
+    output Boolean isComplex;
+  algorithm
+    isComplex := match ty
+      case ARRAY() guard(isComplex(ty.elementType)) then true;
+      case ARRAY() then isComplexArray(ty.elementType);
+      else false;
+    end match;
+  end isComplexArray;
+
   function complexNode
     input Type ty;
     output InstNode node;

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo b/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo
@@ -186,17 +186,21 @@ public
     input Variable var;
     output list<Variable> children;
   algorithm
-    children := match var.ty
-      case Type.COMPLEX() then var :: List.flatten(list(expandChildren(v) for v in var.children));
+    children := if (isComplex(var) or isComplexArray(var))
+      then var :: List.flatten(list(expandChildren(v) for v in var.children))
       else {var};
-    end match;
   end expandChildren;
 
   function isComplex
     input Variable var;
     output Boolean b = Type.isComplex(var.ty);
   end isComplex;
 
+  function isComplexArray
+    input Variable var;
+    output Boolean b = Type.isComplexArray(var.ty);
+  end isComplexArray;
+
   function isStructural
     input Variable variable;
     output Boolean structural =