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

remove unneeded type parameter

This commit is contained in:
Julian Dolby 2017-10-19 13:08:34 -04:00
parent 207181aa89
commit b38286621a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java
View File

@ -304,7 +304,7 @@ public abstract class AstSSAPropagationCallGraphBuilder extends SSAPropagationCa
public boolean hasNoInterestingUses(CGNode node, int vn, DefUse du) {
if (node.getMethod() instanceof AstMethod) {
// uses in nested functions are interesting
IntSet uses = ((AstIRFactory<?>.AstIR) node.getIR()).lexicalInfo().getAllExposedUses();
IntSet uses = ((AstIRFactory.AstIR) node.getIR()).lexicalInfo().getAllExposedUses();
if (uses.contains(vn)) {
return false;
}
@ -739,7 +739,7 @@ public abstract class AstSSAPropagationCallGraphBuilder extends SSAPropagationCa
private void addUpwardFunargConstraints(PointerKey lhs, String name, String definer, CGNode definingNode) {
discoveredUpwardFunargs.add(lhs);
LexicalInformation LI = ((AstIRFactory<?>.AstIR) definingNode.getIR()).lexicalInfo();
LexicalInformation LI = ((AstIRFactory.AstIR) definingNode.getIR()).lexicalInfo();
Pair<String, String>[] names = LI.getExposedNames();
for (int i = 0; i < names.length; i++) {
if (name.equals(names[i].fst) && definer.equals(names[i].snd)) {

4
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIRFactory.java
View File

@ -70,7 +70,7 @@ public class AstIRFactory<T extends IMethod> implements IRFactory<T> {
}
}
public class AstIR extends IR {
public static class AstIR extends IR {
private final LexicalInformation lexicalInfo;
private final SSA2LocalMap localMap;
@ -88,7 +88,7 @@ public class AstIRFactory<T extends IMethod> implements IRFactory<T> {
}
}
private void setupCatchTypes(SSACFG cfg, Map<IBasicBlock<SSAInstruction>, TypeReference[]> map) {
private static void setupCatchTypes(SSACFG cfg, Map<IBasicBlock<SSAInstruction>, TypeReference[]> map) {
for(Entry<IBasicBlock<SSAInstruction>, TypeReference[]> e : map.entrySet()) {
if (e.getKey().getNumber() != -1) {
ExceptionHandlerBasicBlock bb = (ExceptionHandlerBasicBlock) cfg.getNode(e.getKey().getNumber());

14
com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java
View File

@ -51,7 +51,7 @@ public class SSAConversion extends AbstractSSAConversion {
public static boolean DUMP = false;
private final AstIRFactory<?>.AstIR ir;
private final AstIRFactory.AstIR ir;
private int nextSSAValue;
@ -247,12 +247,12 @@ public class SSAConversion extends AbstractSSAConversion {
}
}
public static void undoCopyPropagation(AstIRFactory<?>.AstIR ir, int instruction, int use) {
public static void undoCopyPropagation(AstIRFactory.AstIR ir, int instruction, int use) {
SSAInformation info = (SSAInformation) ir.getLocalMap();
info.undoCopyPropagation(instruction, use);
}
public static void copyUse(AstIRFactory<?>.AstIR ir, int fromInst, int fromUse, int toInst, int toUse) {
public static void copyUse(AstIRFactory.AstIR ir, int fromInst, int fromUse, int toInst, int toUse) {
SSAInformation info = (SSAInformation) ir.getLocalMap();
info.copyUse(fromInst, fromUse, toInst, toUse);
}
@ -519,7 +519,7 @@ public class SSAConversion extends AbstractSSAConversion {
* @param options
*/
@SuppressWarnings("unchecked")
private SSAConversion(AstMethod M, AstIRFactory<?>.AstIR ir, SSAOptions options) {
private SSAConversion(AstMethod M, AstIRFactory.AstIR ir, SSAOptions options) {
super(ir, options);
HashMap<Object, CopyPropagationRecord> m = HashMapFactory.make();
this.copyPropagationMap = (ir.getLocalMap() instanceof SSAInformation) ? ((SSAInformation) ir.getLocalMap()).getCopyHistory()
@ -637,7 +637,7 @@ public class SSAConversion extends AbstractSSAConversion {
computedLocalMap = new SSAInformation();
}
private static IntSet valuesToConvert(AstIRFactory<?>.AstIR ir) {
private static IntSet valuesToConvert(AstIRFactory.AstIR ir) {
SSAInstruction[] insts = ir.getInstructions();
MutableIntSet foundOne = new BitVectorIntSet();
MutableIntSet foundTwo = new BitVectorIntSet();
@ -661,11 +661,11 @@ public class SSAConversion extends AbstractSSAConversion {
return foundTwo;
}
public static SSA2LocalMap convert(AstMethod M, AstIRFactory<?>.AstIR ir, SSAOptions options) {
public static SSA2LocalMap convert(AstMethod M, AstIRFactory.AstIR ir, SSAOptions options) {
return convert(M, ir, options, valuesToConvert(ir));
}
public static SSA2LocalMap convert(AstMethod M, final AstIRFactory<?>.AstIR ir, SSAOptions options, final IntSet values) {
public static SSA2LocalMap convert(AstMethod M, final AstIRFactory.AstIR ir, SSAOptions options, final IntSet values) {
try {
if (DEBUG) {
System.err.println(("starting conversion for " + values));