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

temporary fix to data dependence issue for GetCaughtException in slicer 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1770 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2007-09-19 18:00:16 +00:00
parent dfc9ee6b1f
commit cbf1972a7c
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PDG.java
View File

@ -35,21 +35,7 @@ import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
import com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions;
import com.ibm.wala.ipa.slicer.Statement.Kind;
import com.ibm.wala.shrikeBT.IInstruction;
import com.ibm.wala.ssa.DefUse;
import com.ibm.wala.ssa.IR;
import com.ibm.wala.ssa.ISSABasicBlock;
import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
import com.ibm.wala.ssa.SSAArrayLengthInstruction;
import com.ibm.wala.ssa.SSAArrayReferenceInstruction;
import com.ibm.wala.ssa.SSACheckCastInstruction;
import com.ibm.wala.ssa.SSAFieldAccessInstruction;
import com.ibm.wala.ssa.SSAGetCaughtExceptionInstruction;
import com.ibm.wala.ssa.SSAInstanceofInstruction;
import com.ibm.wala.ssa.SSAInstruction;
import com.ibm.wala.ssa.SSANewInstruction;
import com.ibm.wala.ssa.SSAPhiInstruction;
import com.ibm.wala.ssa.SSAPiInstruction;
import com.ibm.wala.ssa.SSAReturnInstruction;
import com.ibm.wala.ssa.*;
import com.ibm.wala.types.TypeReference;
import com.ibm.wala.util.collections.Filter;
import com.ibm.wala.util.collections.FilterIterator;
@ -57,7 +43,7 @@ import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.Iterator2Collection;
import com.ibm.wala.util.collections.MapUtil;
import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.debug.*;
import com.ibm.wala.util.debug.UnimplementedError;
import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
import com.ibm.wala.util.intset.BitVectorIntSet;
@ -277,6 +263,38 @@ public class PDG extends SlowSparseNumberedGraph<Statement> {
DefUse DU = node.getDU();
SSAInstruction[] instructions = ir.getInstructions();
//
// TODO: teach some other bit of code about the uses of
// GetCaughtException, and then delete this code.
//
if (! dOptions.isIgnoreExceptions()) {
for (ISSABasicBlock bb : ir.getControlFlowGraph()) {
if (bb.isCatchBlock()) {
SSACFG.ExceptionHandlerBasicBlock ehbb =
(SSACFG.ExceptionHandlerBasicBlock)bb;
if (ehbb.getCatchInstruction() != null) {
Statement c = ssaInstruction2Statement(ehbb.getCatchInstruction());
for (ISSABasicBlock pb :
ir.getControlFlowGraph().getExceptionalPredecessors(ehbb)) {
SSAInstruction pi = instructions[ pb.getLastInstructionIndex() ];
assert pi != null;
if (pi instanceof SSAAbstractInvokeInstruction) {
SSAAbstractInvokeInstruction i =
(SSAAbstractInvokeInstruction)pi;
addEdge(new ParamStatement.ExceptionalReturnCaller(node, i), c);
} else if (pi instanceof SSAAbstractThrowInstruction) {
addEdge(ssaInstruction2Statement(pi), c);
}
}
}
}
}
}
for (Iterator<? extends Statement> it = iterator(); it.hasNext();) {
Statement s = it.next();
switch (s.getKind()) {

2
com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java
View File

@ -31,7 +31,7 @@ import com.ibm.wala.util.collections.HashMapFactory;
import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.collections.Iterator2Collection;
import com.ibm.wala.util.collections.IteratorUtil;
import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.debug.*;
import com.ibm.wala.util.graph.AbstractNumberedGraph;
import com.ibm.wala.util.graph.EdgeManager;
import com.ibm.wala.util.graph.NodeManager;