Fix stack overflow

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24473 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 7, 2015 · 9e45cdf · 9e45cdf
1 parent 887a839
commit 9e45cdf
Showing 1 changed file with 5 additions and 17 deletions.
diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -934,7 +934,7 @@ protected function selectSecondaryParameters
   input array<Integer> inSecondaryParams;
   output array<Integer> outSecondaryParams;
 algorithm
-  outSecondaryParams := matchcontinue(inOrdering)
+  outSecondaryParams := match inOrdering
     local
       Integer i;
       array<Integer> secondaryParams;
@@ -947,25 +947,13 @@ algorithm
     // fixed=false
     case i::rest equation
       param = BackendVariable.getVarAt(inParameters, i);
-      false = BackendVariable.varFixed(param);
-
-      secondaryParams = List.fold(inM[i], markIndex, inSecondaryParams);
-      secondaryParams = selectSecondaryParameters(rest, inParameters, inM, secondaryParams);
-    then secondaryParams;
-
-    // fixed=true, but dependent
-    case i::rest equation
-      1 = inSecondaryParams[i];
-
-      secondaryParams = List.fold(inM[i], markIndex, inSecondaryParams);
+      secondaryParams = if (not BackendVariable.varFixed(param)) or 1 == inSecondaryParams[i]
+        then List.fold(inM[i], markIndex, inSecondaryParams)
+        else inSecondaryParams;
       secondaryParams = selectSecondaryParameters(rest, inParameters, inM, secondaryParams);
     then secondaryParams;
 
-    // primary
-    case i::rest equation
-      secondaryParams = selectSecondaryParameters(rest, inParameters, inM, inSecondaryParams);
-    then secondaryParams;
-  end matchcontinue;
+  end match;
 end selectSecondaryParameters;
 
 protected function flattenParamComp