Pull up getIntValueFromInstanceKey() to Ones super class.

Author: khatchad

com.ibm.wala.cast.python.ml/source/com/ibm/wala/cast/python/ml/client/OneHot.java

@@ -12,7 +12,6 @@
 import com.ibm.wala.cast.python.ml.types.TensorType.Dimension;
 import com.ibm.wala.cast.python.ml.types.TensorType.NumericDim;
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
@@ -23,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 public class OneHot extends Ones {
@@ -204,19 +202,6 @@ private Set<Integer> getPossibleAxes(PropagationCallGraphBuilder builder) {
     return ret;
   }
 
-  private static Optional<Integer> getIntValueFromInstanceKey(InstanceKey instanceKey) {
-    if (instanceKey instanceof ConstantKey) {
-      ConstantKey<?> constantKey = (ConstantKey<?>) instanceKey;
-      Object value = constantKey.getValue();
-
-      if (value == null) return Optional.empty();
-      return Optional.of(((Long) value).intValue());
-    }
-
-    throw new IllegalArgumentException(
-        "Cannot get integer value from non-constant InstanceKey: " + instanceKey + ".");
-  }
-
   private int getDepthArgumentValueNumber() {
     // TODO: Handle keyword arguments.
     return this.getArgumentValueNumber(this.getDepthParameterPosition());

com.ibm.wala.cast.python.ml/source/com/ibm/wala/cast/python/ml/client/Ones.java

@@ -6,10 +6,13 @@
 import com.ibm.wala.cast.python.ml.types.TensorFlowTypes.DType;
 import com.ibm.wala.cast.python.ml.types.TensorType.Dimension;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointsToSetVariable;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -60,4 +63,17 @@ protected int getShapeParameterPosition() {
   protected int getDTypeParameterPosition() {
     return DTYPE_PARAMETER_POSITION;
   }
+
+  protected static Optional<Integer> getIntValueFromInstanceKey(InstanceKey instanceKey) {
+    if (instanceKey instanceof ConstantKey) {
+      ConstantKey<?> constantKey = (ConstantKey<?>) instanceKey;
+      Object value = constantKey.getValue();
+
+      if (value == null) return Optional.empty();
+      return Optional.of(((Long) value).intValue());
+    }
+
+    throw new IllegalArgumentException(
+        "Cannot get integer value from non-constant InstanceKey: " + instanceKey + ".");
+  }
 }