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

try to fix javac compile errors

Browse Source 
git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4226 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
msridhar1 2011-07-22 17:06:09 +00:00
parent 3e4e4836e2
commit 82d751a814
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java
View File

@ -78,7 +78,7 @@ public abstract class AbstractIntStackMachine implements FixedPointConstants {
/**
* The solver
*/
private DataflowSolver solver;
private DataflowSolver<BasicBlock,MachineState> solver;
/**
* The control flow graph to analyze
@ -257,14 +257,14 @@ public abstract class AbstractIntStackMachine implements FixedPointConstants {
}
public MachineState getEntryState() {
return (MachineState) solver.getIn(cfg.entry());
return solver.getIn(cfg.entry());
}
/**
* @return the state at the entry to a given block
*/
public MachineState getIn(ShrikeCFG.BasicBlock bb) {
return (MachineState) solver.getIn(bb);
return solver.getIn(bb);
}
private class MeetOperator extends AbstractMeetOperator<MachineState> {
@ -547,7 +547,7 @@ public abstract class AbstractIntStackMachine implements FixedPointConstants {
/**
* Representation of the state of the JVM stack machine at some program point.
*/
public class MachineState extends AbstractVariable {
public class MachineState extends AbstractVariable<MachineState> {
private int[] stack;
private int[] locals;
@ -711,8 +711,7 @@ public abstract class AbstractIntStackMachine implements FixedPointConstants {
return result;
}
public void copyState(IVariable v) {
MachineState other = (MachineState) v;
public void copyState(MachineState other) {
if (other.stack == null) {
stack = null;
} else {

2
com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java
View File

@ -31,7 +31,7 @@ import com.ibm.wala.ssa.SymbolTable;
*
* @see TypeInference for the canonical client of this machinery.
*/
public abstract class SSAInference<T extends IVariable> extends DefaultFixedPointSolver<T> {
public abstract class SSAInference<T extends IVariable<?>> extends DefaultFixedPointSolver<T> {
static final boolean DEBUG = false;
/**