From: bdemsky <bdemsky>
Date: Mon, 21 May 2007 07:34:37 +0000 (+0000)
Subject: bug in equals method
X-Git-Tag: preEdgeChange~580
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e3335dd3b1029b414ae8fdba3e44f0cebbd34228;p=IRC.git

bug in equals method
---

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TagAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TagAnalysis.java
index 72ad3b86..24b7417a 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TagAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TagAnalysis.java
@@ -167,6 +167,7 @@ private void computeCallsFlags(FlatMethod fm, Hashtable parammap, Set tagbinding
     
     private void computeTagBindings(Set roots) {
 	tovisit.addAll(roots);
+
 	for(Iterator it=roots.iterator();it.hasNext();) {
 	    TagBinding tb=(TagBinding)it.next();
 	    discovered.put(tb,tb);
@@ -180,6 +181,7 @@ private void computeCallsFlags(FlatMethod fm, Hashtable parammap, Set tagbinding
 	    Hashtable parammap=new Hashtable();
 	    int offset=md.isStatic()?0:1;
 
+
 	    for(int i=0;i<fm.numParameters();i++) {
 		TempDescriptor temp=fm.getParameter(i);
 		int offsetindex=i-offset;
@@ -191,8 +193,11 @@ private void computeCallsFlags(FlatMethod fm, Hashtable parammap, Set tagbinding
 		    }
 		}
 	    }
+
 	    HashSet newtags=new HashSet();
+	
 	    computeCallsFlags(fm, parammap, newtags, tb.getAllocations());
+
 	    for(Iterator tagit=newtags.iterator();tagit.hasNext();) {
 		TagBinding newtag=(TagBinding)tagit.next();
 		Edge e=new Edge(newtag);
diff --git a/Robust/src/Analysis/TaskStateAnalysis/TagBinding.java b/Robust/src/Analysis/TaskStateAnalysis/TagBinding.java
index 6f8bbc5d..e7360b96 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TagBinding.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TagBinding.java
@@ -50,6 +50,7 @@ public class TagBinding extends GraphNode {
 			return false;
 		} else if(tb.tdarray[i]!=null)
 		    return false;
+	    return true;
 	}
 	return false;
     }
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index de6b3bbc..f2438e40 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -109,7 +109,6 @@ public class Main {
       if (state.TASKSTATE) {
 	  CallGraph callgraph=new CallGraph(state);
 	  TagAnalysis taganalysis=new TagAnalysis(state, callgraph);
-	  
 	  TaskAnalysis ta=new TaskAnalysis(state, taganalysis);
 	  ta.taskAnalysis();
       }