From: bdemsky <bdemsky>
Date: Wed, 6 Apr 2011 21:15:22 +0000 (+0000)
Subject: bug and remove debug code
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4e7ec1ea23019a96f3ed5ed4195c801e0d54827;p=IRC.git

bug and remove debug code
---

diff --git a/Robust/src/Analysis/Disjoint/TaintSet.java b/Robust/src/Analysis/Disjoint/TaintSet.java
index 902bc498..c5363794 100644
--- a/Robust/src/Analysis/Disjoint/TaintSet.java
+++ b/Robust/src/Analysis/Disjoint/TaintSet.java
@@ -174,20 +174,6 @@ public class TaintSet extends Canonical {
   }
   
   public String toString() {
-    String s = "taints[";
-
-    Iterator<Taint> tItr = taints.iterator();
-    while( tItr.hasNext() ) {
-      Taint t = tItr.next();
-      if (t.toString().indexOf("applyCavity")!=-1) {
-	s += t.toString();
-	if( tItr.hasNext() ) {
-	  s += ",\\n";
-	}
-      }
-    }
-    s += "]";
-    return s;
-    //    return taints.toString();
+    return taints.toString();
   }
 }
diff --git a/Robust/src/Analysis/Pointer/Edge.java b/Robust/src/Analysis/Pointer/Edge.java
index e8239036..afbfffb8 100644
--- a/Robust/src/Analysis/Pointer/Edge.java
+++ b/Robust/src/Analysis/Pointer/Edge.java
@@ -214,8 +214,8 @@ public class Edge {
       if ((mask&statuspredicate)==mask) {
 	Edge e=new Edge();
 	e.fd=fd;
-	e.src=factory.getAllocNode(src, (mask|3)==0);
-	e.dst=factory.getAllocNode(dst, (mask|5)==0);
+	e.src=factory.getAllocNode(src, (mask&3)==0);
+	e.dst=factory.getAllocNode(dst, (mask&5)==0);
 	earray[edgeindex++]=e;
       }
       mask=mask<<1;