Something is wrong with liveness results that want to prune away everything during...

diff --git a/Robust/src/Analysis/MLP/MLPAnalysis.java b/Robust/src/Analysis/MLP/MLPAnalysis.java
index 7742b76cb4523b594a234b0b99d97ff40055f9d1..8f2208d466dfcec6e99d71e06ab7b3e6407d7266 100644 (file)
--- a/Robust/src/Analysis/MLP/MLPAnalysis.java
+++ b/Robust/src/Analysis/MLP/MLPAnalysis.java
@@ -504,18 +504,26 @@ public class MLPAnalysis {
 
     default: {          
       Set<VariableSourceToken> stallSet = vstTable.getStallSet( currentSESE );
-      if( !stallSet.isEmpty() ) {
+     
+      /*
+      Set<TempDescriptor>      liveIn   = livenessResults.get( fn );
+
+      if( liveIn != null ) {
+       stallSet.retainAll( liveIn );
+      } else {
+       // there is nothing live, clear all
+       stallSet.clear();
+      }
+      */
 
+      if( !stallSet.isEmpty() ) {
        s = "STALL for:";
-
        Iterator<VariableSourceToken> itr = stallSet.iterator();
        while( itr.hasNext() ) {
          VariableSourceToken vst = itr.next();
          s += "  "+vst.getVarLive();
        }       
-      } 
-      
-
+      }      
     } break;
 
     } // end switch

diff --git a/Robust/src/Analysis/MLP/VarSrcTokTable.java b/Robust/src/Analysis/MLP/VarSrcTokTable.java
index 9a4bb65587908d5ff890968136cec23f591303eb..b71d2805746f10e4e5494d1f2ab9695b699cc1e2 100644 (file)
--- a/Robust/src/Analysis/MLP/VarSrcTokTable.java
+++ b/Robust/src/Analysis/MLP/VarSrcTokTable.java
@@ -424,15 +424,13 @@ public class VarSrcTokTable {
   }\r
 \r
 \r
-  public Set<VariableSourceToken> getStallSet( FlatSESEEnterNode curr/*,                                                                       TempDescriptor varLive*/ ) {\r
-\r
+  public Set<VariableSourceToken> getStallSet( FlatSESEEnterNode curr ) {\r
 \r
     Set<VariableSourceToken> out = new HashSet<VariableSourceToken>();\r
 \r
     Iterator<FlatSESEEnterNode> cItr = curr.getChildren().iterator();\r
     while( cItr.hasNext() ) {\r
       FlatSESEEnterNode child = cItr.next();\r
-      //out.addAll( get( new SVKey( child, varLive ) ) );\r
       out.addAll( get( child ) );\r
     }\r
 \r

diff --git a/Robust/src/Tests/mlp/tinyTest/test.java b/Robust/src/Tests/mlp/tinyTest/test.java
index ebe0a08e451c0b06f1e47a89ab108614fd6bfa66..e29ea0381df3ee114971e8f93bb2a5a40298f038 100644 (file)
--- a/Robust/src/Tests/mlp/tinyTest/test.java
+++ b/Robust/src/Tests/mlp/tinyTest/test.java
@@ -22,9 +22,9 @@ public class Test {
     int x = 1;
 
     sese fi {
-      if( true ) {
-       x = 2;
-      }
+      //if( true ) {
+      x = 2;
+      //}
     }
 
     x = x + 1;