run ooojava and rcrpointer that print out effects and annotate them with the source...

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

diff --git a/Robust/src/Analysis/Disjoint/EffectsAnalysis.java b/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
index fbf21ea6709aa9024bf523b1c218c0a412888ad4..90d2b8e342d2ed42cec4465e0597965a70d615ca 100644 (file)
--- a/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
@@ -136,7 +136,7 @@ public class EffectsAnalysis {
       RefEdge edge          = iterator.next();
       TaintSet taintSet      = edge.getTaints();
       AllocSite affectedAlloc = edge.getDst().getAllocSite();
-      Effect effect        = new Effect(affectedAlloc, Effect.read, fld);
+      Effect    effect        = new Effect(affectedAlloc, Effect.read, fld, currentProgramPoint);
 
       for (Iterator<Taint> taintSetIter = taintSet.iterator(); taintSetIter.hasNext(); ) {
         Taint taint = taintSetIter.next();
@@ -146,10 +146,10 @@ public class EffectsAnalysis {
   }
 
   public void analyzeFlatFieldNode(Set<Edge> sources, FieldDescriptor fld, FlatNode currentProgramPoint) {
-    for (Edge edge : sources) {
-      TaintSet taintSet      = edge.getTaints();
-      Alloc affectedAlloc = edge.getDst().getAllocSite();
-      Effect effect        = new Effect(affectedAlloc, Effect.read, fld);
+    for (Edge edge:sources) {
+      TaintSet  taintSet      = edge.getTaints();
+      Alloc     affectedAlloc = edge.getDst().getAllocSite();
+      Effect    effect        = new Effect(affectedAlloc, Effect.read, fld, currentProgramPoint);
 
       if (taintSet!=null)
         for (Taint taint : taintSet.getTaints()) {
@@ -169,11 +169,11 @@ public class EffectsAnalysis {
       RefEdge edge          = iterator.next();
       TaintSet taintSet      = edge.getTaints();
       AllocSite affectedAlloc = edge.getDst().getAllocSite();
-      Effect effect        = new Effect(affectedAlloc, Effect.write, fld);
-      Effect effectSU      = null;
+      Effect    effect        = new Effect(affectedAlloc, Effect.write, fld, currentProgramPoint);
+      Effect    effectSU      = null;
 
       if (strongUpdate) {
-        effectSU = new Effect(affectedAlloc, Effect.strongupdate, fld);
+        effectSU = new Effect(affectedAlloc, Effect.strongupdate, fld, currentProgramPoint);
       }
 
       for (Iterator<Taint> taintSetIter = taintSet.iterator(); taintSetIter.hasNext(); ) {
@@ -192,7 +192,7 @@ public class EffectsAnalysis {
     for (Edge edge : dstedges) {
       TaintSet taintSet = edge.getTaints();
       Alloc affectedAlloc = edge.getDst().getAllocSite();
-      Effect effect = new Effect(affectedAlloc, Effect.write, fld);
+      Effect effect = new Effect(affectedAlloc, Effect.write, fld, currentProgramPoint);
       if (taintSet!=null)
         for (Taint taint : taintSet.getTaints()) {
           add(taint, effect, currentProgramPoint);