From 82d751a814672caade5d236e84d3e5b5db25af26 Mon Sep 17 00:00:00 2001
From: msridhar1 <msridhar1@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Fri, 22 Jul 2011 17:06:09 +0000
Subject: [PATCH] try to fix javac compile errors

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@4226 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../stackMachine/AbstractIntStackMachine.java         | 11 +++++------
 .../src/com/ibm/wala/dataflow/ssa/SSAInference.java   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java
index 0f655e381..74b8d47bb 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java
@@ -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 {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java
index cff41b1b8..0d111c6ac 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java
@@ -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;
 
   /**