there was a simple fix for variable problem, in new model we want to cut out all...

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index 7f75a6bf80e9c405c27a57043bddfb9ac6b37702..c80e4e9457c323e60806dba82ad9f1919bf3dc21 100644 (file)
--- a/Robust/src/Analysis/Disjoint/ReachGraph.java
+++ b/Robust/src/Analysis/Disjoint/ReachGraph.java
@@ -1733,9 +1733,9 @@ public class ReachGraph {
       HeapRegionNode hrnCaller = id2hrn.get( hrnID );
       assert hrnCaller != null;
 
-      // when clearing off nodes, don't eliminate variable
+      // when clearing off nodes, also eliminate variable
       // references
-      wipeOut( hrnCaller, false );
+      wipeOut( hrnCaller, true );
     }
 
 

diff --git a/Robust/src/Tests/disjoint/predicateTest2/makefile b/Robust/src/Tests/disjoint/predicateTest2/makefile
index 3c09af0f34ada1b66813c38bad1bdf97148439fc..7a4c6b095ab13f9f39cd41e26f37cea1a7b7d033 100644 (file)
--- a/Robust/src/Tests/disjoint/predicateTest2/makefile
+++ b/Robust/src/Tests/disjoint/predicateTest2/makefile
@@ -4,7 +4,8 @@ SOURCE_FILES=$(PROGRAM).java
 
 BUILDSCRIPT=~/research/Robust/src/buildscript
 
-DEBUGFLAGS= -disjoint-debug-callsite Bar addSomething 1
+#DEBUGFLAGS= -disjoint-debug-callsite Bar addSomething 1
+DEBUGFLAGS= -disjoint-debug-callsite Foo main 1
 
 #DEBUGFLAGS= -disjoint-debug-callsite main analysisEntryMethod 1
 #DEBUGFLAGS= -disjoint-debug-callsite addSomething main 1

diff --git a/Robust/src/Tests/disjoint/predicateTest2/test.java b/Robust/src/Tests/disjoint/predicateTest2/test.java
index 19e73f4ea1445707ef316de137715747d3c875ba..46b0cd302ce9602d5b9a7d90fa6adc0d5a92e0e7 100644 (file)
--- a/Robust/src/Tests/disjoint/predicateTest2/test.java
+++ b/Robust/src/Tests/disjoint/predicateTest2/test.java
@@ -20,8 +20,7 @@ public class Test {
   }   
 
   public static void addSomething( Foo f ) {
-    f.b = new Bar();
-    //addBar( f );
+    addBar( f );
   }
 
   public static void addBar( Foo g ) {