From: jjenista <jjenista>
Date: Thu, 11 Mar 2010 21:54:35 +0000 (+0000)
Subject: there was a simple fix for variable problem, in new model we want to cut out all... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f56b0551db504a5d7e4aec9ba311d8f3cd135fb;p=IRC.git

there was a simple fix for variable problem, in new model we want to cut out all region to region AND var to region edges in caller before we map callee effects back in, things look good for one call but chains any longer get messed up--investigating...
---

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index 7f75a6bf..c80e4e94 100644
--- 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 3c09af0f..7a4c6b09 100644
--- 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 19e73f4e..46b0cd30 100644
--- 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 ) {