From: bdemsky <bdemsky>
Date: Tue, 22 Mar 2011 04:53:59 +0000 (+0000)
Subject: change so that new analysis runs for all benchmarks
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66bfe6b8611c476ccda59b33866b2a61f574c28f;p=IRC.git

change so that new analysis runs for all benchmarks
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 9492990e..0eeb4549 100644
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -405,7 +405,8 @@ public class ConflictGraph {
             Effect effectB = (Effect) iterator2.next();
 
             if (effectA.getAffectedAllocSite().equals(effectB.getAffectedAllocSite())
-                && effectA.getField().equals(effectB.getField())) {
+                && ((effectA.getField()!=null&&effectB.getField()!=null&&effectA.getField().equals(effectB.getField()))||
+		    (effectA.getField()==null&&effectB.getField()==null))) {
 
               if (useReachInfo) {
                 FlatNew fnRoot1 = asA.getFlatNew();