1. Removed a quadratic loop in SimplifyLikeLineariser.ssc in favor of a linear procedure call

2. Inlining requires two fields OriginalBlocks and OriginalLocVars in Implementation.  These are set just before inlining is called and now I reset them to null afterwards to help garbage collection.
3. Clear live variables right after passification again to help garbage collection.

1 files changed, 11 insertions, 0 deletions

diff --git a/Source/Core/DeadVarElim.ssc b/Source/Core/DeadVarElim.ssc
index e60a59c3..ba7f377b 100644
--- a/Source/Core/DeadVarElim.ssc
+++ b/Source/Core/DeadVarElim.ssc
@@ -76,6 +76,9 @@ namespace Microsoft.Boogie
     }

     

     public override Implementation! VisitImplementation(Implementation! impl) {

+      //Console.WriteLine("Procedure {0}", impl.Name);

+      //Console.WriteLine("Initial number of blocks = {0}", impl.Blocks.Count);

+      

       Set<Block!> multiPredBlocks = ComputeMultiPredecessorBlocks(impl);

       Set<Block!> visitedBlocks = new Set<Block!>();

       Set<Block!> removedBlocks = new Set<Block!>();

@@ -117,11 +120,19 @@ namespace Microsoft.Boogie
         }

       }

       impl.Blocks = newBlocks;

+      

+      //Console.WriteLine("Final number of blocks = {0}", impl.Blocks.Count);

       return impl;

     }

   }

   

   public class LiveVariableAnalysis {

+    public static void ClearLiveVariables(Implementation! impl) {

+      foreach (Block! block in impl.Blocks) {

+        block.liveVarsBefore = null;

+      }

+    }

+    

 	public static void ComputeLiveVariables(Implementation! impl) {

 	  Microsoft.Boogie.Helpers.ExtraTraceInformation("Starting live variable analysis");

 	  Graphing.Graph<Block> dag = new Graph<Block>();