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

adapt to checkcast change 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3820 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2010-04-28 19:35:53 +00:00
parent 3c8c5e2059
commit f2a390d485
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/DemandCastChecker.java
View File

@ -234,9 +234,18 @@ public class DemandCastChecker {
SSAInstruction instruction = instrs[i];
if (instruction instanceof SSACheckCastInstruction) {
SSACheckCastInstruction castInstr = (SSACheckCastInstruction) instruction;
final TypeReference declaredResultType = castInstr.getDeclaredResultType();
if (declaredResultType.isPrimitiveType())
final TypeReference[] declaredResultTypes = castInstr.getDeclaredResultTypes();
boolean primOnly = true;
for (TypeReference t : declaredResultTypes) {
if (! t.isPrimitiveType()) {
primOnly = false;
}
}
if (primOnly) {
continue;
}
System.err.println("CHECKING " + castInstr + " in " + node.getMethod());
PointerKey castedPk = heapModel.getPointerKeyForLocal(node, castInstr.getUse(0));
Predicate<InstanceKey> castPred = new Predicate<InstanceKey>() {
@ -244,10 +253,12 @@ public class DemandCastChecker {
@Override
public boolean test(InstanceKey ik) {
TypeReference ikTypeRef = ik.getConcreteType().getReference();
if (!cha.isAssignableFrom(cha.lookupClass(declaredResultType), cha.lookupClass(ikTypeRef))) {
return false;
for (TypeReference t : declaredResultTypes) {
if (cha.isAssignableFrom(cha.lookupClass(t), cha.lookupClass(ikTypeRef))) {
return true;
}
}
return true;
return false;
}
};