turn strong updates back on from yesterday testing, add a non-terminating example...

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index d775acaa6bb3db989997fc24f27b0b0332cfe6eb..d61a76c7a44afeac3003c9b6a8a6f8bb2f6ef473 100644 (file)
--- a/Robust/src/Analysis/Disjoint/ReachGraph.java
+++ b/Robust/src/Analysis/Disjoint/ReachGraph.java
@@ -9,7 +9,7 @@ import java.io.*;
 public class ReachGraph {
 
   // use to disable improvements for comparison
-  protected static final boolean DISABLE_STRONG_UPDATES = true;
+  protected static final boolean DISABLE_STRONG_UPDATES = false;
   protected static final boolean DISABLE_GLOBAL_SWEEP   = false;
                   
   // a special out-of-scope temp

diff --git a/Robust/src/Tests/disjoint/nonTermination2/makefile b/Robust/src/Tests/disjoint/nonTermination2/makefile
new file mode 100644 (file)
index 0000000..28536c9
--- /dev/null
+++ b/Robust/src/Tests/disjoint/nonTermination2/makefile
@@ -0,0 +1,33 @@
+PROGRAM=test
+
+SOURCE_FILES=$(PROGRAM).java
+
+BUILDSCRIPT=~/research/Robust/src/buildscript
+
+
+BSFLAGS= -mainclass Test -justanalyze -disjoint -disjoint-k 2 -disjoint-write-dots final -enable-assertions
+
+all: $(PROGRAM).bin
+
+view: PNGs
+       eog *.png &
+
+PNGs: DOTs
+       d2p *COMPLETE*.dot
+
+DOTs: $(PROGRAM).bin
+
+$(PROGRAM).bin: $(SOURCE_FILES)
+       $(BUILDSCRIPT) $(BSFLAGS) $(DEBUGFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
+
+OLDBSFLAGS= -mainclass Test -justanalyze -ownership -ownallocdepth 1 -ownwritedots final -enable-assertions
+old: $(SOURCE_FILES)
+       $(BUILDSCRIPT) $(OLDBSFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
+
+clean:
+       rm -f  $(PROGRAM).bin
+       rm -fr tmpbuilddirectory
+       rm -f  *~
+       rm -f  *.dot
+       rm -f  *.png
+       rm -f  aliases.txt

diff --git a/Robust/src/Tests/disjoint/nonTermination2/test.java b/Robust/src/Tests/disjoint/nonTermination2/test.java
new file mode 100644 (file)
index 0000000..2d0ebb3
--- /dev/null
+++ b/Robust/src/Tests/disjoint/nonTermination2/test.java
@@ -0,0 +1,44 @@
+public class Foo {
+  public Foo() {}
+  public Foo f;
+}
+
+public class Test {
+
+  static public void main( String[] args ) {
+    /*
+    Foo x = new Foo();
+    Foo y = new Foo();
+    x.f = y;
+
+    while( false ) {
+      
+      y = x;     
+      
+      while( false )  {
+        Foo t = y.f;
+        y.f = null;
+        y = t;
+      }
+
+    }
+    */
+
+    Foo x   = new Foo();
+    x.f     = new Foo();
+    x.f.f   = x;
+
+    Foo y = null;
+
+    while( false ) { 
+
+      //erase all edges in circle list
+      Foo tmpy = y.f;
+      y.f      = null;
+      tmpy.f   = null;
+      y        = x.f.f;
+    }
+
+
+  }   
+}