If tensor shapes are coming from a variable, make sure we know about it.

Author: khatchad

com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java

@@ -4128,13 +4128,19 @@ public void testConvertToTensor4()
     test("tf2_test_convert_to_tensor4.py", "f", 1, 1, Map.of(2, Set.of(TENSOR_2_2_FLOAT32)));
   }
 
-  @Test
+  /**
+   * Should not throw an {@link IllegalArgumentException} once https://github.com/wala/ML/issues/340 is fixed.
+   */
+  @Test(expected = IllegalArgumentException.class)
   public void testConvertToTensor5()
       throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     test("tf2_test_convert_to_tensor5.py", "f", 1, 1, Map.of(2, Set.of(TENSOR_2_2_FLOAT32)));
   }
 
-  @Test
+  /**
+   * Should not throw an {@link IllegalArgumentException} once https://github.com/wala/ML/issues/340 is fixed.
+   */
+  @Test(expected = IllegalArgumentException.class)
   public void testConvertToTensor6()
       throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     test("tf2_test_convert_to_tensor6.py", "f", 1, 1, Map.of(2, Set.of(TENSOR_5_INT32)));

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

@@ -88,6 +88,10 @@ public Set<TensorType> getTensorTypes(PropagationCallGraphBuilder builder) {
    */
   protected Set<List<Dimension<?>>> getShapesFromShapeArgument(
       PropagationCallGraphBuilder builder, Iterable<InstanceKey> pointsToSet) {
+    if (pointsToSet == null || !pointsToSet.iterator().hasNext())
+      throw new IllegalArgumentException(
+          "Empty points-to set for shape argument in source: " + source + ".");
+
     Set<List<Dimension<?>>> ret = HashSetFactory.make();
     PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
 
@@ -266,6 +270,11 @@ protected Set<List<Dimension<?>>> getShapes(
     PointerKey valuePK =
         pointerAnalysis.getHeapModel().getPointerKeyForLocal(this.getNode(), valueNumber);
     OrdinalSet<InstanceKey> valuePointsToSet = pointerAnalysis.getPointsToSet(valuePK);
+
+    if (valuePointsToSet.isEmpty())
+      throw new IllegalArgumentException(
+          "Empty points-to set for value number: " + valueNumber + " in: " + this.getNode() + ".");
+
     return getShapesOfValue(builder, valuePointsToSet);
   }
 
@@ -278,6 +287,10 @@ protected Set<List<Dimension<?>>> getShapes(
    */
   private Set<List<Dimension<?>>> getShapesOfValue(
       PropagationCallGraphBuilder builder, OrdinalSet<InstanceKey> valuePointsToSet) {
+    if (valuePointsToSet == null || valuePointsToSet.isEmpty())
+      throw new IllegalArgumentException(
+          "Empty points-to set for value in source: " + source + ".");
+
     Set<List<Dimension<?>>> ret = HashSetFactory.make();
     PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
 
@@ -349,6 +362,10 @@ else if (valueIK instanceof AllocationSiteInNode) {
    */
   protected EnumSet<DType> getDTypesFromDTypeArgument(
       PropagationCallGraphBuilder builder, Iterable<InstanceKey> pointsToSet) {
+    if (pointsToSet == null || !pointsToSet.iterator().hasNext())
+      throw new IllegalArgumentException(
+          "Empty points-to set for dtype argument in source: " + source + ".");
+
     EnumSet<DType> ret = EnumSet.noneOf(DType.class);
     PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
 
@@ -509,6 +526,11 @@ protected EnumSet<DType> getDTypes(PropagationCallGraphBuilder builder, int valu
     PointerKey valuePK =
         pointerAnalysis.getHeapModel().getPointerKeyForLocal(this.getNode(), valueNumber);
     OrdinalSet<InstanceKey> valuePointsToSet = pointerAnalysis.getPointsToSet(valuePK);
+
+    if (valuePointsToSet == null || valuePointsToSet.isEmpty())
+      throw new IllegalArgumentException(
+          "Empty points-to set for value number: " + valueNumber + " in: " + this.getNode() + ".");
+
     return getDTypesOfValue(builder, valuePointsToSet);
   }
 
@@ -522,6 +544,10 @@ protected EnumSet<DType> getDTypes(PropagationCallGraphBuilder builder, int valu
    */
   private EnumSet<DType> getDTypesOfValue(
       PropagationCallGraphBuilder builder, OrdinalSet<InstanceKey> valuePointsToSet) {
+    if (valuePointsToSet == null || valuePointsToSet.isEmpty())
+      throw new IllegalArgumentException(
+          "Empty points-to set for value in source: " + source + ".");
+
     EnumSet<DType> ret = EnumSet.noneOf(DType.class);
     PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();