Don't wrap functions within if expressions

OpenModelica · Feb 23, 2016 · 86267ae · 86267ae
1 parent 265024d
commit 86267ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Compiler/BackEnd/CommonSubExpression.mo b/Compiler/BackEnd/CommonSubExpression.mo
@@ -243,7 +243,12 @@ protected function wrapFunctionCalls3
   output DAE.Exp outExp;
   output tuple<tuple<HashTableExpToExp.HashTable, Integer, list<BackendDAE.Equation>, list<BackendDAE.Var>, DAE.FunctionTree>, DAE.ElementSource> outTuple;
 algorithm
-  (outExp, outTuple) := Expression.traverseExpBottomUp(inExp, wrapFunctionCalls_main, inTuple);
+  if Expression.isExpIfExp(inExp) then
+    outExp  := inExp;
+    outTuple := inTuple;
+  else
+    (outExp, outTuple) := Expression.traverseExpBottomUp(inExp, wrapFunctionCalls_main, inTuple);
+  end if;
 end wrapFunctionCalls3;
 
 protected function wrapFunctionCalls_main

diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -9636,6 +9636,17 @@ algorithm
   end match;
 end isExpCrefOrIfExp;
 
+public function isExpIfExp
+"Returns true if expression is an if expression"
+  input DAE.Exp e;
+  output Boolean res;
+algorithm
+  res := match(e)
+    case(DAE.IFEXP()) then true;
+    else false;
+  end match;
+end isExpIfExp;
+
 public function operatorEqual
 "Helper function to expEqual."
   input DAE.Operator inOperator1;