DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix to use BasicBlockInContext for exit blocks in transverse edges from collapsed nodes 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1890 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2007-10-17 15:14:00 +00:00
parent 7258e02966
commit 2040035f6f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java
View File

@ -263,7 +263,7 @@ public class PartiallyCollapsedSupergraph extends AbstractGraph<Object> implemen
public CGNode getProcOf(Object n) throws IllegalArgumentException {
if (!(n instanceof com.ibm.wala.ipa.cfg.BasicBlockInContext) && n instanceof com.ibm.wala.cfg.IBasicBlock) {
throw new IllegalArgumentException(
"(n instanceof com.ibm.wala.cfg.IBasicBlock) and (not ( n instanceof com.ibm.wala.ipa.cfg.BasicBlockInContext ) )");
"(n instanceof com.ibm.wala.cfg.IBasicBlock) and (not ( n instanceof com.ibm.wala.ipa.cfg.BasicBlockInContext ) ): " + n + ", " + n.getClass());
}
if (n instanceof BasicBlockInContext) {
return partialIPFG.getCGNode((BasicBlockInContext) n);
@ -341,7 +341,8 @@ public class PartiallyCollapsedSupergraph extends AbstractGraph<Object> implemen
outgoing.add(entry);
// add the edge representing the return from the call.
IBasicBlock exit = cfg.exit();
BasicBlockInContext<ISSABasicBlock> exit = new BasicBlockInContext<ISSABasicBlock>(outNode, cfg.exit());
// IBasicBlock exit = cfg.exit();
Object retSite = nodeManager.getCollapsedExit(node);
incoming = MapUtil.findOrCreateSet(incomingTransverseEdges, retSite);
incoming.add(exit);