Removes "representative" property of variables in SSA form

teavm-core/src/main/java/org/teavm/javascript/JavascriptBuilder.java

@@ -109,6 +109,9 @@ public class JavascriptBuilder {
                 ValueType.arrayOf(ValueType.CHARACTER), ValueType.VOID)));
         dependencyChecker.checkDependencies();
         ListableClassHolderSource classSet = dependencyChecker.cutUnachievableClasses();
+        Decompiler decompiler = new Decompiler(classSet, classLoader);
+        ClassSetOptimizer optimizer = new ClassSetOptimizer();
+        optimizer.optimizeAll(classSet);
         if (bytecodeLogging) {
             try {
                 logBytecode(new PrintWriter(new OutputStreamWriter(logStream, "UTF-8")), classSet);
@@ -116,9 +119,6 @@ public class JavascriptBuilder {
                 // Just don't do anything
             }
         }
-        Decompiler decompiler = new Decompiler(classSet, classLoader);
-        ClassSetOptimizer optimizer = new ClassSetOptimizer();
-        optimizer.optimizeAll(classSet);
         renderer.renderRuntime();
         List<ClassNode> clsNodes = decompiler.decompile(classSet.getClassNames());
         for (ClassNode clsNode : clsNodes) {

teavm-core/src/main/java/org/teavm/model/Program.java

@@ -37,7 +37,6 @@ public class Program {
     public Variable createVariable() {
         Variable variable = new Variable(this);
         variable.setIndex(variables.size());
-        variable.setRepresentative(variable.getIndex());
         variables.add(variable);
         return variable;
     }

teavm-core/src/main/java/org/teavm/model/Variable.java

@@ -22,7 +22,6 @@ package org.teavm.model;
 public class Variable {
     private Program program;
     private int index;
-    private int representative;
 
     Variable(Program program) {
         this.program = program;
@@ -43,12 +42,4 @@ public class Variable {
     void setProgram(Program program) {
         this.program = program;
     }
-
-    public int getRepresentative() {
-        return representative;
-    }
-
-    public void setRepresentative(int representative) {
-        this.representative = representative;
-    }
 }

teavm-core/src/main/java/org/teavm/model/util/InstructionStringifier.java

@@ -30,10 +30,6 @@ public class InstructionStringifier implements InstructionVisitor {
         this.sb = sb;
     }
 
-    private StringBuilder appendVar(Variable var) {
-        return sb.append('@').append(var.getIndex()).append(":").append(var.getRepresentative());
-    }
-
     @Override
     public void visit(EmptyInstruction insn) {
         sb.append("nop");
@@ -41,43 +37,49 @@ public class InstructionStringifier implements InstructionVisitor {
 
     @Override
     public void visit(ClassConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := classOf ").append(insn.getConstant());
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := classOf ")
+                .append(insn.getConstant());
     }
 
     @Override
     public void visit(NullConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := null");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := null");
     }
 
     @Override
     public void visit(IntegerConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
+                .append(insn.getConstant());
     }
 
     @Override
     public void visit(LongConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
+                .append(insn.getConstant());
     }
 
     @Override
     public void visit(FloatConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
+                .append(insn.getConstant());
     }
 
     @Override
     public void visit(DoubleConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
+                .append(insn.getConstant());
     }
 
     @Override
     public void visit(StringConstantInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := '").append(insn.getConstant()).append("'");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := '")
+                .append(insn.getConstant()).append("'");
     }
 
     @Override
     public void visit(BinaryInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getFirstOperand()).append(" ");
+                .append(insn.getFirstOperand().getIndex()).append(" ");
         switch (insn.getOperation()) {
             case ADD:
                 sb.append("+");
@@ -116,26 +118,24 @@ public class InstructionStringifier implements InstructionVisitor {
                 sb.append("^");
                 break;
         }
-        sb.append(' ');
+        sb.append(" @").append(insn.getSecondOperand().getIndex());
-        appendVar(insn.getSecondOperand());
     }
 
     @Override
     public void visit(NegateInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := -");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := -")
-        appendVar(insn.getOperand());
+                .append(" @").append(insn.getOperand().getIndex());
     }
 
     @Override
     public void visit(AssignInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getAssignee());
+                .append(insn.getAssignee().getIndex());
     }
 
     @Override
     public void visit(BranchingInstruction insn) {
-        sb.append("if ");
+        sb.append("if @").append(insn.getOperand().getIndex()).append(" ");
-        appendVar(insn.getOperand()).append(" ");
         switch (insn.getCondition()) {
             case EQUAL:
                 sb.append("== 0");
@@ -168,8 +168,7 @@ public class InstructionStringifier implements InstructionVisitor {
 
     @Override
     public void visit(BinaryBranchingInstruction insn) {
-        sb.append("if ");
+        sb.append("if @").append(insn.getFirstOperand().getIndex()).append(" ");
-        appendVar(insn.getFirstOperand()).append(" ");
         switch (insn.getCondition()) {
             case EQUAL:
             case REFERENCE_EQUAL:
@@ -180,7 +179,8 @@ public class InstructionStringifier implements InstructionVisitor {
                 sb.append("!=");
                 break;
         }
-        appendVar(insn.getSecondOperand()).append(" then goto $").append(insn.getConsequent().getIndex())
+        sb.append("@").append(insn.getSecondOperand().getIndex())
+                .append(" then goto $").append(insn.getConsequent().getIndex())
                 .append(" else goto $").append(insn.getAlternative().getIndex());
     }
 
@@ -191,15 +191,15 @@ public class InstructionStringifier implements InstructionVisitor {
 
     @Override
     public void visit(SwitchInstruction insn) {
-        sb.append("switch ");
+        sb.append("switch @").append(insn.getCondition().getIndex()).append(" ");
-        appendVar(insn.getCondition()).append(" ");
         List<SwitchTableEntry> entries = insn.getEntries();
         for (int i = 0; i < entries.size(); ++i) {
             if (i > 0) {
                 sb.append("; ");
             }
             SwitchTableEntry entry = entries.get(i);
-            sb.append("case ").append(entry.getCondition()).append(": goto $").append(entry.getTarget());
+            sb.append("case ").append(entry.getCondition()).append(": goto $")
+                    .append(entry.getTarget());
         }
         sb.append(", default: goto $").append(insn.getDefaultTarget());
     }
@@ -208,46 +208,48 @@ public class InstructionStringifier implements InstructionVisitor {
     public void visit(ExitInstruction insn) {
         sb.append("return");
         if (insn.getValueToReturn() != null) {
-            sb.append(" ");
+            sb.append(" @").append(insn.getValueToReturn().getIndex());
-            appendVar(insn.getValueToReturn());
         }
     }
 
     @Override
     public void visit(RaiseInstruction insn) {
-        sb.append("throw ");
+        sb.append("throw @").append(insn.getException().getIndex());
-        appendVar(insn.getException());
     }
 
     @Override
     public void visit(ConstructArrayInstruction insn) {
-        appendVar(insn.getReceiver()).append(" = new ").append(insn.getItemType()).append("[");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
-        appendVar(insn.getSize()).append(']');
+                .append(insn.getItemType()).append("[@").append(insn.getSize().getIndex())
+                .append(']');
     }
 
     @Override
     public void visit(ConstructInstruction insn) {
-        appendVar(insn.getReceiver()).append(" = new ").append(insn.getType()).append("()");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
+                .append(insn.getType()).append("()");
     }
 
     @Override
     public void visit(ConstructMultiArrayInstruction insn) {
-        appendVar(insn.getReceiver()).append(" = new ").append(insn.getItemType()).append("[");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
+                .append(insn.getItemType()).append("[");
         List<Variable> dimensions = insn.getDimensions();
         for (int i = 0; i < dimensions.size(); ++i) {
             if (i > 0) {
                 sb.append(", ");
             }
-            appendVar(dimensions.get(i));
+            Variable dimension = dimensions.get(i);
+            sb.append("@").append(dimension.getIndex());
         }
         sb.append("]");
     }
 
     @Override
     public void visit(GetFieldInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := ");
         if (insn.getInstance() != null) {
-            appendVar(insn.getInstance());
+            sb.append("@").append(insn.getInstance().getIndex());
         } else {
             sb.append(insn.getField().getClassName());
         }
@@ -257,35 +259,34 @@ public class InstructionStringifier implements InstructionVisitor {
     @Override
     public void visit(PutFieldInstruction insn) {
         if (insn.getInstance() != null) {
-            appendVar(insn.getInstance());
+            sb.append("@").append(insn.getInstance().getIndex());
         } else {
             sb.append(insn.getField().getClassName());
         }
-        sb.append(".").append(insn.getField()).append(" := ");
+        sb.append(".").append(insn.getField()).append(" := @").append(insn.getValue().getIndex());
-        appendVar(insn.getValue());
     }
 
     @Override
     public void visit(GetElementInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getArray()).append("[");
+                .append(insn.getArray().getIndex()).append("[@")
-        appendVar(insn.getIndex()).append("]");
+                .append(insn.getIndex().getIndex()).append("]");
     }
 
     @Override
     public void visit(PutElementInstruction insn) {
-        appendVar(insn.getArray()).append("[");
+        sb.append("@").append(insn.getArray().getIndex()).append("[@")
-        appendVar(insn.getIndex()).append("] := ");
+                .append(insn.getIndex().getIndex()).append("] := @")
-        appendVar(insn.getValue());
+                .append(insn.getValue().getIndex());
     }
 
     @Override
     public void visit(InvokeInstruction insn) {
         if (insn.getReceiver() != null) {
-            appendVar(insn.getReceiver()).append(" := ");
+            sb.append("@").append(insn.getReceiver().getIndex()).append(" := ");
         }
         if (insn.getInstance() != null) {
-            appendVar(insn.getInstance());
+            sb.append("@").append(insn.getInstance().getIndex());
         } else {
             sb.append(insn.getMethod().getClassName());
         }
@@ -295,52 +296,55 @@ public class InstructionStringifier implements InstructionVisitor {
             if (i > 0) {
                 sb.append(", ");
             }
-            appendVar(arguments.get(i));
+            sb.append("@").append(arguments.get(i).getIndex());
         }
         sb.append(")");
     }
 
     @Override
     public void visit(IsInstanceInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getValue()).append(" instanceof ").append(insn.getType());
+                .append(insn.getValue().getIndex()).append(" instanceof ").append(insn.getType());
     }
 
     @Override
     public void visit(CastInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := cast ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
-        appendVar(insn.getValue()).append(" to ").append(insn.getTargetType());
+                .append(insn.getValue().getIndex()).append(" to ")
+                .append(insn.getTargetType());
     }
 
     @Override
     public void visit(CastNumberInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := cast ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
-        appendVar(insn.getValue()).append(" from ").append(insn.getSourceType())
+                .append(insn.getValue().getIndex())
+                .append(" from ").append(insn.getSourceType())
                 .append(" to ").append(insn.getTargetType());
     }
 
     @Override
     public void visit(CastIntegerInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := cast ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
-        appendVar(insn.getValue()).append(" from INT to ").append(insn.getTargetType());
+                .append(insn.getValue().getIndex())
+                .append(" from INT to ").append(insn.getTargetType());
     }
 
     @Override
     public void visit(UnwrapArrayInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getArray()).append(".data");
+                .append(insn.getArray()).append(".data");
     }
 
     @Override
     public void visit(ArrayLengthInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
-        appendVar(insn.getArray()).append(".length");
+                .append(insn.getArray().getIndex()).append(".length");
     }
 
     @Override
     public void visit(CloneArrayInstruction insn) {
-        appendVar(insn.getReceiver()).append(" := ");
+        sb.append("@").append(insn.getReceiver().getIndex()).append("@")
-        appendVar(insn.getArray()).append(".clone()");
+                .append(insn.getArray().getIndex()).append(".clone()");
     }
 
     @Override

teavm-core/src/main/java/org/teavm/model/util/ListingBuilder.java

@@ -31,16 +31,14 @@ public class ListingBuilder {
             sb.append(prefix).append("$").append(i).append(":\n");
             for (Phi phi : block.getPhis()) {
                 sb.append(prefix).append("    ");
-                sb.append("@").append(phi.getReceiver().getIndex()).append(":")
+                sb.append("@").append(phi.getReceiver().getIndex()).append(" := ");
-                        .append(phi.getReceiver().getRepresentative()).append(" := ");
                 List<Incoming> incomings = phi.getIncomings();
                 for (int j = 0; j < incomings.size(); ++j) {
                     if (j > 0) {
                         sb.append(", ");
                     }
                     Incoming incoming = incomings.get(j);
-                    sb.append("@").append(incoming.getValue().getIndex()).append(":")
+                    sb.append("@").append(incoming.getValue().getIndex()).append(" from ")
-                            .append(incoming.getValue().getRepresentative()).append(" from ")
                             .append("$").append(incoming.getSource().getIndex());
                 }
                 sb.append("\n");

teavm-core/src/main/java/org/teavm/model/util/PhiEliminator.java

@@ -1,24 +0,0 @@
-/*
- *  Copyright 2014 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.model.util;
-
-/**
- *
- * @author Alexey Andreev
- */
-public class PhiEliminator {
-
-}

teavm-core/src/main/java/org/teavm/parsing/SSATransformer.java

@@ -77,9 +77,6 @@ public class SSATransformer {
                 }
             }
         }
-        for (int i = 0; i <= arguments.length; ++i) {
-            program.variableAt(i).setRepresentative(i);
-        }
         arguments = null;
     }
 
@@ -126,7 +123,6 @@ public class SSATransformer {
             for (Phi phi : currentBlock.getPhis()) {
                 Variable var = program.createVariable();
                 variableMap[phi.getReceiver().getIndex()] = var;
-                var.setRepresentative(phi.getReceiver().getIndex());
                 phi.setReceiver(var);
             }
             for (Instruction insn : currentBlock.getInstructions()) {
@@ -185,7 +181,6 @@ public class SSATransformer {
 
     private Variable define(Variable var) {
         Variable result = program.createVariable();
-        result.setRepresentative(var.getIndex());
         variableMap[var.getIndex()] = result;
         return result;
     }