From: jjenista <jjenista>
Date: Tue, 24 Jan 2012 21:49:29 +0000 (+0000)
Subject: didnt get what I wanted before
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d1021b31afbad9e14e9bac38e416e885c657524f;p=IRC.git

didnt get what I wanted before
---

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index 6c0e1c88..26f812f1 100644
--- a/Robust/src/Analysis/Disjoint/ReachGraph.java
+++ b/Robust/src/Analysis/Disjoint/ReachGraph.java
@@ -5495,9 +5495,18 @@ public class ReachGraph {
     HeapRegionNode hrn = id2hrn.get( id );
     Iterator<RefEdge> refItr = hrn.iteratorToReferencers();
     while( refItr.hasNext() ) {
-      RefSrcNode rsn = refItr.next().getSrc();
+      RefEdge    edge = refItr.next();
+      RefSrcNode rsn  = edge.getSrc();
       if( rsn instanceof VariableNode ) {
-        s += "    "+rsn+"\n";
+        VariableNode vn = (VariableNode)rsn;
+        s += "    "+vn+"\n";
+      } else {
+        HeapRegionNode hrnSrc = (HeapRegionNode)rsn;
+        s += "    ";
+        if( hrnSrc.isOutOfContext() ) {
+          s += "(OOC)";
+        } 
+        s += hrnSrc.getID()+"."+edge.getField()+"\n";
       }
     }
     
diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index fe3e1702..4a029fbe 100644
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -80,8 +80,8 @@ DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-
 DISJOINTDEBUG= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) \
 	-justanalyze \
 	-disjoint-count-graph-elements \
-	-disjoint-disable-strong-update \
-	-disjoint-disable-global-sweep
+	-disjoint-disable-strong-update
+#	-disjoint-disable-global-sweep
 
 #	-disjoint-summarize-per-class
 #	-disjoint-disable-predicates \
@@ -187,6 +187,7 @@ clean:
 	rm -f  aliases.txt
 	rm -f  mlpReport*txt
 	rm -f  results*txt
+	rm -f  countElementsNodeListing.txt
 	rm -f *log
 	rm -f coreprof.dat
 	rm -f trace.out
diff --git a/Robust/src/Tests/disjoint/strong-up-change-node-count/makefile b/Robust/src/Tests/disjoint/strong-up-change-node-count/makefile
index e3131157..5f08b1a4 100644
--- a/Robust/src/Tests/disjoint/strong-up-change-node-count/makefile
+++ b/Robust/src/Tests/disjoint/strong-up-change-node-count/makefile
@@ -29,4 +29,4 @@ clean:
 	rm -f  *~
 	rm -f  *.dot
 	rm -f  *.png
-	rm -f  aliases.txt
+	rm -f  aliases.txt countElementsNodeListing.txt
\ No newline at end of file