wasm gc: fix issues with type inference

konsoletyper · Sep 4, 2024 · fcf6d72 · fcf6d72
1 parent a9d46ac
commit fcf6d72
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/core/src/main/java/org/teavm/backend/wasm/gc/WasmGCVariableCategoryProvider.java b/core/src/main/java/org/teavm/backend/wasm/gc/WasmGCVariableCategoryProvider.java
@@ -22,20 +22,15 @@
 
 public class WasmGCVariableCategoryProvider implements VariableCategoryProvider {
     private ClassHierarchy hierarchy;
-    private PreciseTypeInference inference;
 
     public WasmGCVariableCategoryProvider(ClassHierarchy hierarchy) {
         this.hierarchy = hierarchy;
     }
 
-    public PreciseTypeInference getTypeInference() {
-        return inference;
-    }
-
     @Override
     public Object[] getCategories(Program program, MethodReference method) {
-        inference = new PreciseTypeInference(program, method, hierarchy);
-        inference.setPhisSkipped(true);
+        var inference = new PreciseTypeInference(program, method, hierarchy);
+        inference.setPhisSkipped(false);
         inference.setBackPropagation(true);
         var result = new Object[program.variableCount()];
         for (int i = 0; i < program.variableCount(); ++i) {

diff --git a/core/src/main/java/org/teavm/backend/wasm/generate/gc/methods/WasmGCMethodGenerator.java b/core/src/main/java/org/teavm/backend/wasm/generate/gc/methods/WasmGCMethodGenerator.java
@@ -25,6 +25,7 @@
 import org.teavm.ast.decompilation.Decompiler;
 import org.teavm.backend.wasm.BaseWasmFunctionRepository;
 import org.teavm.backend.wasm.WasmFunctionTypes;
+import org.teavm.backend.wasm.gc.PreciseTypeInference;
 import org.teavm.backend.wasm.gc.WasmGCVariableCategoryProvider;
 import org.teavm.backend.wasm.gc.vtable.WasmGCVirtualTableProvider;
 import org.teavm.backend.wasm.generate.gc.WasmGCNameProvider;
@@ -220,7 +221,10 @@ private void generateRegularMethodBody(MethodHolder method, WasmFunction functio
         allocator.allocateRegisters(method.getReference(), method.getProgram(), friendlyToDebugger);
         var ast = decompiler.decompileRegular(method);
         var firstVar = method.hasModifier(ElementModifier.STATIC) ? 1 : 0;
-        var typeInference = categoryProvider.getTypeInference();
+        var typeInference = new PreciseTypeInference(method.getProgram(), method.getReference(), hierarchy);
+        typeInference.setPhisSkipped(true);
+        typeInference.setBackPropagation(true);
+        typeInference.ensure();
 
         var registerCount = 0;
         for (var i = 0; i < method.getProgram().variableCount(); ++i) {

diff --git a/core/src/main/java/org/teavm/model/util/RegisterAllocator.java b/core/src/main/java/org/teavm/model/util/RegisterAllocator.java
@@ -22,6 +22,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import org.teavm.common.DisjointSet;
 import org.teavm.common.MutableGraphEdge;
 import org.teavm.common.MutableGraphNode;
@@ -53,7 +54,8 @@ public void allocateRegisters(MethodReference method, Program program, boolean d
                 program, method.parameterCount(), liveness);
         DisjointSet congruenceClasses = buildPhiCongruenceClasses(program);
         joinClassNodes(interferenceGraph, congruenceClasses);
-        removeRedundantCopies(program, interferenceGraph, congruenceClasses);
+        var categories = variableCategoryProvider.getCategories(program, method);
+        removeRedundantCopies(program, interferenceGraph, congruenceClasses, categories);
         int[] classArray = congruenceClasses.pack(program.variableCount());
         renameVariables(program, classArray);
         int[] colors = new int[program.variableCount()];
@@ -68,8 +70,13 @@ public void allocateRegisters(MethodReference method, Program program, boolean d
         for (int cls : classArray) {
             maxClass = Math.max(maxClass, cls + 1);
         }
-        var categories = variableCategoryProvider.getCategories(program, method);
         String[] names = getVariableNames(program, debuggerFriendly);
+        var newCategories = new Object[categories.length];
+        for (int i = 0; i < categories.length; ++i) {
+            var cls = classArray[i];
+            newCategories[cls] = categories[i];
+        }
+        categories = newCategories;
         colorer.colorize(MutableGraphNode.toGraph(interferenceGraph), colors, categories, names);
 
         int maxColor = 0;
@@ -274,7 +281,7 @@ private void insertCopy(Incoming incoming, Map<BasicBlock, BasicBlock> blockMap)
     }
 
     private void removeRedundantCopies(Program program, List<MutableGraphNode> interferenceGraph,
-            DisjointSet congruenceClasses) {
+            DisjointSet congruenceClasses, Object[] categories) {
         for (int i = 0; i < program.basicBlockCount(); ++i) {
             BasicBlock block = program.basicBlockAt(i);
             Instruction nextInsn;
@@ -297,7 +304,8 @@ private void removeRedundantCopies(Program program, List<MutableGraphNode> inter
                         break;
                     }
                 }
-                if (!interfere) {
+                if (!interfere && Objects.equals(categories[assignment.getReceiver().getIndex()],
+                        categories[assignment.getAssignee().getIndex()])) {
                     int newClass = congruenceClasses.union(copyClass, origClass);
                     insn.delete();
                     if (newClass == interferenceGraph.size()) {