No need to match special call (#12261)

- Try to evaluate array constructor binding - Partially revert #12133
OpenModelica · May 16, 2024 · 0314f81 · 0314f81
1 parent 26c8457
commit 0314f81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/OMCompiler/Compiler/NBackEnd/Classes/NBVariable.mo b/OMCompiler/Compiler/NBackEnd/Classes/NBVariable.mo
@@ -48,6 +48,7 @@ public
   import BackendExtension = NFBackendExtension;
   import NFBackendExtension.{BackendInfo, VariableKind, VariableAttributes};
   import NFBinding.Binding;
+  import Ceval = NFCeval;
   import Class = NFClass;
   import ComponentRef = NFComponentRef;
   import Dimension = NFDimension;
@@ -1132,7 +1133,7 @@ public
     end match;
   end getBindingVariability;
 
-  function hasLiteralBinding extends checkVar;
+  function hasEvaluableBinding extends checkVar;
   protected
     Variable var;
     Expression binding;
@@ -1141,16 +1142,15 @@ public
     if isBound(var_ptr) then
       var := Pointer.access(var_ptr);
       binding := Binding.getExp(var.binding);
-      if Expression.isLiteral(binding) then
-        b := true;
-      else
+      b := Expression.isLiteral(binding);
+      if not b then
         // try to extract literal from array constructor
         (_, binding) := Iterator.extract(binding);
         binding := SimplifyExp.simplifyDump(binding, true, getInstanceName());
-        b := Expression.isLiteral(binding);
+        b := Expression.isLiteral(Ceval.tryEvalExp(binding));
       end if;
     end if;
-  end hasLiteralBinding;
+  end hasEvaluableBinding;
 
   function setFixed
     input output Pointer<Variable> var_ptr;

diff --git a/OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBInitialization.mo b/OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBInitialization.mo
@@ -330,8 +330,8 @@ public
 
       // parse records slightly different
       if BVariable.isKnownRecord(var) then
-        // only consider non literal parameter bindings
-        if not BVariable.hasLiteralBinding(var) then
+        // only consider non-evaluable parameter bindings
+        if not BVariable.hasEvaluableBinding(var) then
           initial_param_vars := listAppend(BVariable.getRecordChildren(var), initial_param_vars);
           parameter_eqs := Equation.generateBindingEquation(var, idx, true) :: parameter_eqs;
         else
@@ -342,8 +342,8 @@ public
 
       // all other variables that are not records and not record elements to be skipped
       elseif not (BVariable.isRecord(var) or skip_record_element) then
-        // only consider non literal parameter bindings
-        if not BVariable.hasLiteralBinding(var) then
+        // only consider non-evaluable parameter bindings
+        if not BVariable.hasEvaluableBinding(var) then
           // add variable to initial unknowns
           initial_param_vars := var :: initial_param_vars;
           // generate equation only if variable is fixed

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFExpression.mo b/OMCompiler/Compiler/NFFrontEnd/NFExpression.mo
@@ -4402,10 +4402,6 @@ public
       case RECORD() then List.all(exp.elements, isLiteral);
       case RANGE() then isLiteral(exp.start) and isLiteral(exp.stop) and
                         Util.applyOptionOrDefault(exp.step, isLiteral, true);
-      case CALL(call = Call.TYPED_ARRAY_CONSTRUCTOR()) then Call.isLiteral(exp.call);
-      case CAST() then isLiteral(exp.exp);
-      case BOX() then isLiteral(exp.exp);
-      case UNBOX() then isLiteral(exp.exp);
       case FILENAME() then true;
       else false;
     end match;