From: jjenista <jjenista>
Date: Tue, 29 Jun 2010 17:53:08 +0000 (+0000)
Subject: little bug fix
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16f0b98a3e32639e5365e51ac8ac63795a1ab34b;p=IRC.git

little bug fix
---

diff --git a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
index 69492e21..25a35349 100644
--- a/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/DisjointAnalysis.java
@@ -1297,6 +1297,11 @@ public class DisjointAnalysis {
     case FKind.FlatSESEEnterNode:
       sese = (FlatSESEEnterNode) fn;
 
+      if( sese.getIsCallerSESEplaceholder() ) {
+        // ignore these dummy rblocks!
+        break;
+      }
+
       if( doEffectsAnalysis && fmContaining != fmAnalysisEntry ) {
         
         // always remove ALL stall site taints at enter
diff --git a/Robust/src/Tests/disjoint/taintTest1/test.java b/Robust/src/Tests/disjoint/taintTest1/test.java
index 13fc494b..814e2307 100644
--- a/Robust/src/Tests/disjoint/taintTest1/test.java
+++ b/Robust/src/Tests/disjoint/taintTest1/test.java
@@ -13,6 +13,13 @@ public class Test {
     Foo b = new Foo();
 
     rblock r1 {
+
+      rblock c2 {
+        Foo k = a.g;
+      }
+      
+      a.f = new Foo();
+
       Foo x = doSomething( a, b );
 
       // 1 - STALL
@@ -24,6 +31,7 @@ public class Test {
   static Foo doSomething( Foo a, Foo b ) {
 
     Foo z = new Foo();
+    a.g = z;
 
     rblock c1 {
       z.g = new Foo();
@@ -31,7 +39,7 @@ public class Test {
 
     // 1 (this line commented)
     // 2 (STALL HERE!)
-    //z.g = b;
+    z.g = b;
 
     return z;
   }