Changeset 2ad1387 in OpenModelica

Timestamp:

2022-05-16T14:21:59+02:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

dfa5c6bb, e6877db

Parents:

caa3fcca

git-author:

Andreas <38031952+AnHeuermann@…> (05/16/22 14:21:59)

git-committer:

GitHub <noreply@…> (05/16/22 14:21:59)

Message:

Don't replace constants with function calls. (#8951)

File:

• OMCompiler/Compiler/BackEnd/BackendDAEOptimize.mo (modified) (2 diffs)

OMCompiler/Compiler/BackEnd/BackendDAEOptimize.mo

@@ -768 +768 @@
       DAE.ComponentRef cr;
       Option<DAE.VariableAttributes> attr,new_attr;
+
+    // Don't replace with function calls
+    case (BackendDAE.VAR(bindExp=SOME(DAE.CALL())),_)
+      then(inVar,inTpl);
 
     case (v as BackendDAE.VAR(varName=cr,bindExp=SOME(e),values=attr),(repl,numrepl))
@@ -3478 +3482 @@
         repl := BackendVarTransform.emptyReplacements();
         repl := BackendVariable.traverseBackendDAEVars(globalKnownVars, removeConstantsFinder, repl);
+
+        (globalKnownVars, (repl, _)) := BackendVariable.traverseBackendDAEVarsWithUpdate(globalKnownVars, replaceFinalVarTraverser, (repl, 0));
+
         if Flags.isSet(Flags.DUMP_CONST_REPL) then
           BackendVarTransform.dumpReplacements(repl);
         end if;
-
-        (globalKnownVars, (repl, _)) := BackendVariable.traverseBackendDAEVarsWithUpdate(globalKnownVars, replaceFinalVarTraverser, (repl, 0));
 
         lsteqns := BackendEquation.equationList(shared.initialEqs);