From: bdemsky <bdemsky>
Date: Tue, 27 Jul 2004 19:17:15 +0000 (+0000)
Subject: Bug fix...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75670c5c42cf7f4ec4a0d681db1200317ec29284;p=repair.git

Bug fix...
---

diff --git a/Repair/RepairCompiler/MCC/IR/AbstractRepair.java b/Repair/RepairCompiler/MCC/IR/AbstractRepair.java
index 3783f4b..d888849 100755
--- a/Repair/RepairCompiler/MCC/IR/AbstractRepair.java
+++ b/Repair/RepairCompiler/MCC/IR/AbstractRepair.java
@@ -35,7 +35,7 @@ class AbstractRepair {
 	} else if (getType()==ADDTORELATION) {
 	    RelationDescriptor rd=(RelationDescriptor)descriptor;
 	    return sources.relallocSource(rd,isdomain);
-	} else throw new Error("");
+	} else throw new Error(type());
     }
 
     public SetDescriptor getDomainSet() {
diff --git a/Repair/RepairCompiler/MCC/IR/ConcreteInterferes.java b/Repair/RepairCompiler/MCC/IR/ConcreteInterferes.java
index 8741821..083a506 100755
--- a/Repair/RepairCompiler/MCC/IR/ConcreteInterferes.java
+++ b/Repair/RepairCompiler/MCC/IR/ConcreteInterferes.java
@@ -106,35 +106,36 @@ public class ConcreteInterferes {
     
     static private boolean updateonlytonewobject(MultUpdateNode mun, UpdateNode un, Updates updates) {
 	AbstractRepair ar=mun.getRepair();
-	for(int i=0;i<un.numUpdates();i++) {
-	    Updates u=un.getUpdate(i);
-	    if (u.getType()==Updates.POSITION&&
-		ar.isNewObject(u.getRightPos()==0)) {
-		Expr newleftexpr=u.getLeftExpr();
-		Expr leftexpr=updates.getLeftExpr();
-		boolean foundfield=false;
-		while(true) {
-		    if (leftexpr.equals(null,newleftexpr)) {
-			if (foundfield)
-			    return true;
-			else
+	if ((ar!=null)&&(ar.getType()==AbstractRepair.ADDTOSET||ar.getType()==AbstractRepair.ADDTORELATION))
+	    for(int i=0;i<un.numUpdates();i++) {
+		Updates u=un.getUpdate(i);
+		if (u.getType()==Updates.POSITION&&
+		    ar.isNewObject(u.getRightPos()==0)) {
+		    Expr newleftexpr=u.getLeftExpr();
+		    Expr leftexpr=updates.getLeftExpr();
+		    boolean foundfield=false;
+		    while(true) {
+			if (leftexpr.equals(null,newleftexpr)) {
+			    if (foundfield)
+				return true;
+			    else
+				break;
+			} else if (leftexpr instanceof DotExpr) {
+			    if (!foundfield) {
+				foundfield=true;
+			    } else {
+				if (((DotExpr)leftexpr).isPtr())
+				    break; //if its not a pointer, we're still in the structure
+			    }
+			    leftexpr=((DotExpr)leftexpr).getExpr();
+			} else if (leftexpr instanceof CastExpr) {
+			    leftexpr=((CastExpr)leftexpr).getExpr();
+			} else
 			    break;
-		    } else if (leftexpr instanceof DotExpr) {
-			if (!foundfield) {
-			    foundfield=true;
-			} else {
-			    if (((DotExpr)leftexpr).isPtr())
-				break; //if its not a pointer, we're still in the structure
-			}
-			leftexpr=((DotExpr)leftexpr).getExpr();
-		    } else if (leftexpr instanceof CastExpr) {
-			leftexpr=((CastExpr)leftexpr).getExpr();
-		    } else
-			break;
+		    }
 		}
 	    }
-	}
-
+	
 	return false;
     }
 
diff --git a/Repair/RepairCompiler/MCC/IR/GraphAnalysis.java b/Repair/RepairCompiler/MCC/IR/GraphAnalysis.java
index a44f431..3a5d56f 100755
--- a/Repair/RepairCompiler/MCC/IR/GraphAnalysis.java
+++ b/Repair/RepairCompiler/MCC/IR/GraphAnalysis.java
@@ -261,6 +261,16 @@ public class GraphAnalysis {
 		    }
 
 		    System.out.println("Cycle through conjunction "+gn.getTextLabel() +" which can't be removed.");
+		    System.out.println("CANTREMOVE");
+		    for(Iterator it2=cantremove.iterator();it2.hasNext();) {
+			GraphNode gn2=(GraphNode)it2.next();
+			System.out.println(gn2.getTextLabel());
+		    }
+		    System.out.println("MUSTREMOVE");
+		    for(Iterator it2=mustremove.iterator();it2.hasNext();) {
+			GraphNode gn2=(GraphNode)it2.next();
+			System.out.println(gn2.getTextLabel());
+		    }
 		    return null; // Out of luck
 		}
 	    }