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

correctly prune safe array creation for multi-dimensional array creation

This commit is contained in:
Martin Hecker 2016-12-07 19:27:59 +01:00
parent 4a7efc8c78
commit d5dee55918
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java
View File

@ -81,9 +81,22 @@ public class ShrikeIRFactory implements IRFactory<IBytecodeMethod> {
if (instr instanceof SSANewInstruction) {
SSANewInstruction newInstr = (SSANewInstruction) instr;
if (newInstr.getConcreteType().isArrayType()) {
int vLength = newInstr.getUse(0);
if (isNonNegativeConstant(vLength) || isDefdByArrayLength(vLength, du)) {
newInstrs[i] = new SSANewInstruction(newInstr.iindex, newInstr.getDef(), newInstr.getNewSite(), new int[] { vLength }) {
boolean isSafe = true;
final int[] params = new int[newInstr.getNumberOfUses()];
for (int u = 0; u < newInstr.getNumberOfUses(); u++) {
int vLength = newInstr.getUse(u);
params[u] = vLength;
isSafe &= (isNonNegativeConstant(vLength) || isDefdByArrayLength(vLength, du));
}
if (isSafe) {
// newInstr is either obtained from
// JavaLanguage.JavaInstructionFactory#NewInstruction(int iindex, int result, NewSiteReference site, int[] params)
// or
// JavaLanguage.JavaInstructionFactory#NewInstruction(int iindex, int result, NewSiteReference site)
// , both provide anonymous subclasses of SSANewInstruction which differ
// from SSANewInstruction only in the implementation of getExceptionTypes().
// Hence, it is OK to just defining a new anonymous subclasses of SSANewInstruction, overriding getExceptionTypes().
newInstrs[i] = new SSANewInstruction(newInstr.iindex, newInstr.getDef(), newInstr.getNewSite(), params) {
@Override
public Collection<TypeReference> getExceptionTypes() {
return JavaLanguage.getNewSafeArrayExceptions();