didnt get what I wanted before

diff --git a/Robust/src/Analysis/Disjoint/ReachGraph.java b/Robust/src/Analysis/Disjoint/ReachGraph.java
index 6c0e1c882c243a64cd2fdebf0fbd54368557b017..26f812f1d599ef1bb7af07d893ef8552240f3c52 100644 (file)
--- 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 fe3e170209ac7f5b7bec99634d6af9e2e788785d..4a029fbe2fb833004767cef65bb0c0806acdd3e5 100644 (file)
--- 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 e31311570754bd556c8fcb7ea1a5267ac2be38c2..5f08b1a49cd1f672ce664adca4febca63cc44afe 100644 (file)
--- 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