Updated taint class to allow call site plus var taints as well

[IRC.git] / Robust / src / Analysis / Disjoint / Canonical.java

diff --git a/Robust/src/Analysis/Disjoint/Canonical.java b/Robust/src/Analysis/Disjoint/Canonical.java
index 1caa1de721aa97df78b912800b44618526a2a4b4..bc69349121c0188ee75fe2c4199e63da6cad7c06 100644 (file)
--- a/Robust/src/Analysis/Disjoint/Canonical.java
+++ b/Robust/src/Analysis/Disjoint/Canonical.java
@@ -1271,9 +1271,7 @@ abstract public class Canonical {
     }
     
     // otherwise, no cached result...
-    Taint out = new Taint( t.sese,
-                           t.insetVar,
-                           t.allocSite );
+    Taint out = new Taint( t );
     out.preds = Canonical.join( t.preds,
                                 preds );
     
@@ -1337,13 +1335,12 @@ abstract public class Canonical {
       Taint t2 = ts2.containsIgnorePreds( t1 );
 
       if( t2 != null ) {
-       out.taints.add( Taint.factory( t1.sese,
-                                       t1.insetVar,
-                                       t1.allocSite,
-                                       Canonical.join( t1.preds,
-                                                       t2.preds
-                                                       )
-                                       ) );
+        Taint tNew = new Taint( t1 );
+        tNew.preds = Canonical.join( t1.preds,
+                                     t2.preds
+                                     );
+        tNew = (Taint) makeCanonical( tNew );
+       out.taints.add( tNew );
       } else {
        out.taints.add( t1 );
       }
@@ -1393,13 +1390,12 @@ abstract public class Canonical {
       Taint t2 = ts2.containsIgnorePreds( t1 );
       
       if( t2 != null ) {
-       out.taints.add( Taint.factory( t1.sese,
-                                       t1.insetVar,
-                                       t1.allocSite,
-                                       Canonical.join( t1.preds,
-                                                       t2.preds
-                                                       )
-                                       ) );
+        Taint tNew = new Taint( t1 );
+        tNew.preds = Canonical.join( t1.preds,
+                                     t2.preds
+                                     );
+        tNew = (Taint) makeCanonical( tNew );
+       out.taints.add( tNew );
       } else {
        out.taints.add( t1 );
       }