Changeset a489e50 in OpenModelica

Timestamp:

2021-02-15T12:30:31+01:00 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

Added-citation-metadata, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

423386c, c5f65dbc

Parents:

3de3ab4

git-author:

perost <perost86@…> (02/15/21 12:30:31)

git-committer:

GitHub <noreply@…> (02/15/21 12:30:31)

Message:

Fix #7156 (#7157)

• Try to inline operator record constructors instead of evaluating them when trying to split them during flattening.

Files:

• OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo (modified) (2 diffs)
• OMCompiler/Compiler/NFFrontEnd/NFInline.mo (modified) (3 diffs)
• testsuite/flattening/modelica/scodeinst/Inline2.mo (added)
• testsuite/flattening/modelica/scodeinst/Makefile (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo

@@ -93 +93 @@
 import ArrayConnections = NFArrayConnections;
 import UnorderedMap;
+import Inline = NFInline;
 
 public
@@ -592 +593 @@
       binding_exp := Expression.stripBindingInfo(Ceval.evalExp(binding_exp));
     elseif binding_var == Variability.PARAMETER and Component.isFinal(comp) then
+      // Try to use inlining first.
       try
-        binding_exp_eval := Expression.stripBindingInfo(Ceval.evalExp(binding_exp));
-        // Throw away the evaluated binding if the number of dimensions no
-        // longer match after evaluation, in case Ceval fails to apply the
-        // subscripts correctly.
-        // TODO: Fix this, it shouldn't be needed.
-        0 := Type.dimensionDiff(ty, Expression.typeOf(binding_exp_eval));
-        binding_exp := binding_exp_eval;
+        binding_exp := Inline.inlineRecordConstructorCall(binding_exp);
       else
       end try;
+
+      // If inlining fails, try to evaluate the binding instead.
+      if not Expression.isRecord(binding_exp) then
+        try
+          binding_exp_eval := Expression.stripBindingInfo(Ceval.evalExp(binding_exp));
+
+          // Throw away the evaluated binding if the number of dimensions no
+          // longer match after evaluation, in case Ceval fails to apply the
+          // subscripts correctly.
+          // TODO: Fix this, it shouldn't be needed.
+          0 := Type.dimensionDiff(ty, Expression.typeOf(binding_exp_eval));
+          binding_exp := binding_exp_eval;
+        else
+        end try;
+      end if;
     else
       binding_exp := SimplifyExp.simplify(binding_exp);

OMCompiler/Compiler/NFFrontEnd/NFInline.mo

@@ -32 +32 @@
 encapsulated package NFInline
 
+import Call = NFCall;
+import Expression = NFExpression;
+
+protected
+import Binding = NFBinding;
+import Class = NFClass;
+import Component = NFComponent;
 import ComponentRef = NFComponentRef;
 import DAE.InlineType;
 import Dimension = NFDimension;
-import Expression = NFExpression;
 import Flags;
-import Call = NFCall;
 import NFFunction.Function;
 import NFInstNode.InstNode;
@@ -44 +49 @@
 import Type = NFType;
 
+public
 function inlineCallExp
   input Expression callExp;
@@ -114 +120 @@
 end inlineCall;
 
+function inlineRecordConstructorCall
+  input Expression exp;
+  output Expression outExp;
+protected
+  Function fn;
+  Expression arg;
+  list<Expression> args;
+  list<Statement> body;
+  Binding binding;
+algorithm
+  outExp := match exp
+    case Expression.CALL(call = Call.TYPED_CALL(fn = fn, arguments = args))
+        guard InstNode.name(InstNode.parentScope(fn.node)) == "'constructor'"
+      algorithm
+        body := Function.getBody(fn);
+        true := listEmpty(body);
+        true := listEmpty(fn.locals);
+
+        binding := Component.getBinding(InstNode.component(listHead(fn.outputs)));
+
+        if Binding.hasExp(binding) then
+          outExp := Binding.getExp(binding);
+          true := Expression.isRecord(outExp);
+        else
+          outExp := Class.makeRecordExp(listHead(fn.outputs));
+        end if;
+
+        for i in fn.inputs loop
+          arg :: args := args;
+          outExp := Expression.map(outExp, func = function replaceCrefNode(node = i, value = arg));
+        end for;
+      then
+        outExp;
+  end match;
+end inlineRecordConstructorCall;
+
 protected
 function replaceCrefNode

testsuite/flattening/modelica/scodeinst/Makefile

@@ -610 +610 @@
 ImpureCall1.mo \
 Inline1.mo \
+Inline2.mo \
 InnerOuter1.mo \
 InnerOuter2.mo \