Fix support for multi-dimensional arrays of degree 3 and more in depe…

…ndency analyzer
konsoletyper · Oct 24, 2024 · 24d672e · 24d672e
1 parent 18d6386
commit 24d672e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/core/src/main/java/org/teavm/dependency/DependencyNode.java b/core/src/main/java/org/teavm/dependency/DependencyNode.java
@@ -32,7 +32,6 @@
 import org.teavm.model.ValueType;
 
 public class DependencyNode implements ValueDependencyInfo {
-    private static final int DEGREE_THRESHOLD = 2;
     DependencyAnalyzer dependencyAnalyzer;
     List<DependencyConsumer> followers;
     TypeSet typeSet;
@@ -58,9 +57,6 @@ public class DependencyNode implements ValueDependencyInfo {
     }
 
     public void propagate(DependencyType type) {
-        if (degree > DEGREE_THRESHOLD) {
-            return;
-        }
         if (!hasType(type) && filter(type)) {
             propagateCount++;
             moveToSeparateDomain();
@@ -96,10 +92,6 @@ private void scheduleSingleType(DependencyType type) {
     }
 
     public void propagate(DependencyType[] newTypes) {
-        if (degree > DEGREE_THRESHOLD) {
-            return;
-        }
-
         if (newTypes.length == 0) {
             return;
         }
@@ -314,9 +306,6 @@ private boolean connectWithoutChildNodes(DependencyNode node, DependencyTypeFilt
     }
 
     private void connectArrayItemNodes(DependencyNode node) {
-        if (degree > DEGREE_THRESHOLD || node.degree > DEGREE_THRESHOLD) {
-            return;
-        }
         if (!isArray(typeFilter) || !isArray(node.typeFilter)) {
             return;
         }

diff --git a/core/src/main/java/org/teavm/dependency/PreciseDependencyAnalyzer.java b/core/src/main/java/org/teavm/dependency/PreciseDependencyAnalyzer.java
@@ -24,6 +24,9 @@
 import org.teavm.model.ValueType;
 
 public class PreciseDependencyAnalyzer extends DependencyAnalyzer {
+    private DependencyNode allArrayItemsNode;
+    private static final int DEGREE_THRESHOLD = 2;
+
     public PreciseDependencyAnalyzer(ClassReaderSource classSource, ClassLoader classLoader,
             ServiceRepository services, Diagnostics diagnostics, ReferenceCache referenceCache,
             String[] platformTags) {
@@ -80,11 +83,22 @@ DependencyNode createArrayItemNode(DependencyNode parent) {
         ValueType itemTypeFilter = parent.typeFilter instanceof ValueType.Array
                 ? ((ValueType.Array) parent.typeFilter).getItemType()
                 : null;
-        DependencyNode node = createNode(itemTypeFilter);
-        node.degree = parent.degree + 1;
-        node.method = parent.method;
-        if (DependencyAnalyzer.shouldTag) {
-            node.tag = parent.tag + "[";
+        DependencyNode node;
+        if (parent.degree > DEGREE_THRESHOLD) {
+            if (allArrayItemsNode == null) {
+                allArrayItemsNode = createNode(null);
+                if (DependencyAnalyzer.shouldTag) {
+                    allArrayItemsNode.tag = "<any array item>";
+                }
+            }
+            node = allArrayItemsNode;
+        } else {
+            node = createNode(itemTypeFilter);
+            node.degree = parent.degree + 1;
+            node.method = parent.method;
+            if (DependencyAnalyzer.shouldTag) {
+                node.tag = parent.tag + "[";
+            }
         }
         return node;
     }