changes: only apply the variable analysis on the method containing TASK

diff --git a/Robust/src/Analysis/OoOJava/OoOJavaAnalysis.java b/Robust/src/Analysis/OoOJava/OoOJavaAnalysis.java
index f0df0c61294a7358d10855ac4bccba415114bc2b..a68d0cf53667cea08720873e141d02a2e5e5d5f5 100644 (file)
--- a/Robust/src/Analysis/OoOJava/OoOJavaAnalysis.java
+++ b/Robust/src/Analysis/OoOJava/OoOJavaAnalysis.java
@@ -159,15 +159,15 @@ public class OoOJavaAnalysis {
     State.logEvent("OoOJavaAnalysis 2nd pass completed");
 
     // 3rd pass, variable analysis
-    methItr = descriptorsToAnalyze.iterator();
+    methItr = rblockRel.getMethodsWithSESEs().iterator();
     while (methItr.hasNext()) {
       Descriptor d = methItr.next();
-      FlatMethod fm = state.getMethodFlat(d);
-
-      // starting from roots do a forward, fixed-point
-      // variable analysis for refinement and stalls
-      variableAnalysisForward(fm);
+        FlatMethod fm = state.getMethodFlat(d);
+        // starting from roots do a forward, fixed-point
+        // variable analysis for refinement and stalls
+        variableAnalysisForward(fm);
     }
+     
     State.logEvent("OoOJavaAnalysis 3rd pass completed");
     
     // 4th pass, compute liveness contribution from
@@ -194,11 +194,10 @@ public class OoOJavaAnalysis {
     State.logEvent("OoOJavaAnalysis 5th pass completed");
 
     // 6th pass, not available analysis FOR VARIABLES!
-    methItr = descriptorsToAnalyze.iterator();
+    methItr = rblockRel.getMethodsWithSESEs().iterator();
     while (methItr.hasNext()) {
       Descriptor d = methItr.next();
       FlatMethod fm = state.getMethodFlat(d);
-
       // compute what is not available at every program
       // point, in a forward fixed-point pass
       notAvailableForward(fm);