X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FSSJava%2FFlowGraph.java;h=2ab6dad9ce625cac5d96cda64b5d4f1f989c8b6a;hb=9dfdca00acf795117136425841493a1b0f036f10;hp=8ea9fe5454f40f338896d01fec31dc718f06e8d6;hpb=aa7bbfbe86d24ae3b0e45e426b172a4bea21f97e;p=IRC.git diff --git a/Robust/src/Analysis/SSJava/FlowGraph.java b/Robust/src/Analysis/SSJava/FlowGraph.java index 8ea9fe54..2ab6dad9 100644 --- a/Robust/src/Analysis/SSJava/FlowGraph.java +++ b/Robust/src/Analysis/SSJava/FlowGraph.java @@ -109,7 +109,7 @@ public class FlowGraph { mapDescTupleToInferNode.put(tuple, newNode); // nodeSet.add(newNode); - System.out.println("create new intermediate node= " + newNode); + System.out.println("create new intermediate node= " + newNode); return newNode; } @@ -231,7 +231,11 @@ public class FlowGraph { FlowNode fromNode = getFlowNode(fromDescTuple); FlowNode toNode = getFlowNode(toDescTuple); - // System.out.println("create an edge from " + fromNode + " to " + toNode); + if (toNode.getDescTuple().get(0).equals(LocationInference.LITERALDESC)) { + return; + } + + System.out.println("create an edge from " + fromNode + " to " + toNode); int fromTupleSize = fromDescTuple.size(); NTuple curFromTuple = new NTuple(); @@ -463,13 +467,11 @@ public class FlowGraph { Descriptor localDesc = fn.getDescTuple().get(0); - System.out.println("descTuple=" + descTuple); - if (fn.isIntermediate()) { Location interLoc = new Location(md, localDesc.getSymbol()); interLoc.setLocDescriptor(localDesc); locTuple.add(interLoc); - } else if (localDesc.getSymbol().equals(LocationInference.TOPLOC)) { + } else if (localDesc.getSymbol().equals(SSJavaAnalysis.TOP)) { Location topLoc = new Location(md, Location.TOP); topLoc.setLocDescriptor(LocationInference.TOPDESC); locTuple.add(topLoc);