Changeset 7100384 in OpenModelica

Timestamp:

2016-04-04T08:50:36+02:00 (8 years ago)

Author:

hudson <openmodelica@…>

Branches:

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

Children:

0aff3d1

Parents:

f49dbc4

git-author:

Martin Sjölund <martin.sjolund@…> (04/04/16 08:50:36)

git-committer:

hudson <openmodelica@…> (04/04/16 08:50:36)

Message:

Workaround for bugs with hash tables

Location:

Compiler

Files:

• FrontEnd/Inline.mo (modified) (9 diffs)
• Util/BaseHashTable.mo (modified) (2 diffs)

Compiler/FrontEnd/Inline.mo

@@ -692 +692 @@
     case (e,fns,source)
       equation
-        (e_1,_) = Expression.Expression.traverseExpBottomUp(e,function forceInlineCall(fns=fns),{});
+        (e_1,_) = Expression.traverseExpBottomUp(e,function forceInlineCall(fns=fns),{});
         false = referenceEq(e, e_1);
         source = DAEUtil.addSymbolicTransformation(source,DAE.OP_INLINE(DAE.PARTIAL_EQUATION(e),DAE.PARTIAL_EQUATION(e_1)));
@@ -822 +822 @@
           // MSL 3.2.1 need GenerateEvents to disable this
           newExp = Expression.addNoEventToRelationsAndConds(newExp);
-          (newExp,(_,_,true)) = Expression.Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
+          (newExp,(_,_,true)) = Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
           // for inlinecalls in functions
-          (newExp1,assrtLst) = Expression.Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrtLst);
+          (newExp1,assrtLst) = Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrtLst);
         else // normal Modelica
           // get inputs, body and output
@@ -843 +843 @@
             generateEvents = hasGenerateEventsAnnotation(comment);
             newExp = if not generateEvents then Expression.addNoEventToRelationsAndConds(newExp) else newExp;
-            (newExp,(_,_,true)) = Expression.Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
+            (newExp,(_,_,true)) = Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
             // for inlinecalls in functions
-            (newExp1,assrtLst) = Expression.Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrtLst);
+            (newExp1,assrtLst) = Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrtLst);
           else // assert detected
             true = listLength(assrtStmts) == 1;
@@ -860 +860 @@
             generateEvents = hasGenerateEventsAnnotation(comment);
             newExp = if not generateEvents then Expression.addNoEventToRelationsAndConds(newExp) else newExp;
-            (newExp,(_,_,true)) = Expression.Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
+            (newExp,(_,_,true)) = Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
             assrt = inlineAssert(assrt,fns,argmap,checkcr);
             // for inlinecalls in functions
-            (newExp1,assrtLst) = Expression.Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrt::assrtLst);
+            (newExp1,assrtLst) = Expression.traverseExpBottomUp(newExp,function inlineCall(fns=fns),assrt::assrtLst);
           end if;
         end if;
@@ -887 +887 @@
 algorithm
   DAE.STMT_ASSERT(cond=cond, msg=msg, level=level, source=source) := assrtIn;
-  (cond,_,_,_) := inlineExp(cond,fns,source);
-  (cond,(_,_,true)) := Expression.Expression.traverseExpBottomUp(cond,replaceArgs,(argmap,checkcr,true));
+  (cond,(_,_,true)) := Expression.traverseExpBottomUp(cond,replaceArgs,(argmap,checkcr,true));
   //print("ASSERT inlined: "+ExpressionDump.printExpStr(cond)+"\n");
-  (msg,_,_,_) := inlineExp(msg,fns,source);
-  (msg,(_,_,true)) := Expression.Expression.traverseExpBottomUp(msg,replaceArgs,(argmap,checkcr,true));
+  (msg,(_,_,true)) := Expression.traverseExpBottomUp(msg,replaceArgs,(argmap,checkcr,true));
+  // These clear checkcr/repl and need to be performed last
+  // (cond,_,_,_) := inlineExp(cond,fns,source);
+  // (msg,_,_,_) := inlineExp(msg,fns,source);
   assrtOut := DAE.STMT_ASSERT(cond, msg, level, source);
 end inlineAssert;
@@ -966 +967 @@
         generateEvents = hasGenerateEventsAnnotation(comment);
         newExp = if not generateEvents then Expression.addNoEventToRelationsAndConds(newExp) else newExp;
-        (newExp,(_,_,true)) = Expression.Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
+        (newExp,(_,_,true)) = Expression.traverseExpBottomUp(newExp,replaceArgs,(argmap,checkcr,true));
         // for inlinecalls in functions
         (newExp1,assrtLst) = Expression.traverseExpBottomUp(newExp,function forceInlineCall(fns=fns),assrtLst);
@@ -1600 +1601 @@
     case DAE.PARTIAL_EQUATION(e)
       equation
-        (e_1,_) = Expression.Expression.traverseExpBottomUp(e,fn,{});
+        (e_1,_) = Expression.traverseExpBottomUp(e,fn,{});
         changed = not referenceEq(e, e_1);
         eq2 = DAE.PARTIAL_EQUATION(e_1);
@@ -1608 +1609 @@
     case DAE.RESIDUAL_EXP(e)
       equation
-        (e_1,_) = Expression.Expression.traverseExpBottomUp(e,fn,{});
+        (e_1,_) = Expression.traverseExpBottomUp(e,fn,{});
         changed = not referenceEq(e, e_1);
         eq2 = DAE.RESIDUAL_EXP(e_1);
@@ -1616 +1617 @@
     case DAE.EQUALITY_EXPS(e1,e2)
       equation
-        (e1_1,_) = Expression.Expression.traverseExpBottomUp(e1,fn,{});
-        (e2_1,_) = Expression.Expression.traverseExpBottomUp(e2,fn,{});
+        (e1_1,_) = Expression.traverseExpBottomUp(e1,fn,{});
+        (e2_1,_) = Expression.traverseExpBottomUp(e2,fn,{});
         changed = not (referenceEq(e1, e1_1) and referenceEq(e2, e2_1));
         eq2 = DAE.EQUALITY_EXPS(e1_1,e2_1);

Compiler/Util/BaseHashTable.mo

@@ -649 +649 @@
   Key key;
   array<Option<HashEntry>> vae;
+  constant Boolean workaroundForBug=true "TODO: Make it impossible to update a value by not updating n (fully mutable HT instead of this hybrid)";
+  constant Boolean debug=false;
 algorithm
   (hv, (vs, ve, vae), bs, ft as (hashFunc,_,_,_)) := ht;
@@ -655 +657 @@
       case SOME((key,_))
         algorithm
-          hash_idx := hashFunc(key, bs) + 1;
-          arrayUpdate(hv, hash_idx, {});
+          if not workaroundForBug then
+            hash_idx := hashFunc(key, bs) + 1;
+            arrayUpdate(hv, hash_idx, {});
+          end if;
           arrayUpdate(vae, i, NONE());
         then ();
       else
         algorithm
-          return;
+          if not workaroundForBug then return; end if;
         then ();
     end match;
   end for;
+  if debug then
+    for i in vae loop
+      if isSome(i) then
+        print("vae not empty\n");
+        break;
+      end if;
+    end for;
+  end if;
+  if workaroundForBug then
+    for i in 1:arrayLength(hv) loop
+      if not listEmpty(arrayGet(hv,i)) then
+        if debug then print("hv not empty\n"); end if;
+        arrayUpdate(hv,i,{});
+      end if;
+    end for;
+  end if;
 end clearAssumeNoDelete;