eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix slowness

Browse Source
This commit is contained in:
Alexey Andreev 2015-01-30 12:46:10 +04:00
parent c0d28a236c
commit c546af553b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
teavm-core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
View File

@ -16,6 +16,7 @@
package org.teavm.model.util; package org.teavm.model.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import org.teavm.dependency.DependencyInfo; import org.teavm.dependency.DependencyInfo;
import org.teavm.diagnostics.Diagnostics; import org.teavm.diagnostics.Diagnostics;
@ -33,15 +34,21 @@ public class MissingItemsProcessor {
private List<Instruction> instructionsToAdd = new ArrayList<>(); private List<Instruction> instructionsToAdd = new ArrayList<>();
private MethodHolder methodHolder; private MethodHolder methodHolder;
private Program program; private Program program;
private Collection<String> achievableClasses;
private Collection<MethodReference> achievableMethods;
private Collection<FieldReference> achievableFields;
public MissingItemsProcessor(DependencyInfo dependencyInfo, Diagnostics diagnostics) { public MissingItemsProcessor(DependencyInfo dependencyInfo, Diagnostics diagnostics) {
this.dependencyInfo = dependencyInfo; this.dependencyInfo = dependencyInfo;
this.diagnostics = diagnostics; this.diagnostics = diagnostics;
achievableClasses = dependencyInfo.getAchievableClasses();
achievableMethods = dependencyInfo.getAchievableMethods();
achievableFields = dependencyInfo.getAchievableFields();
} }
public void processClass(ClassHolder cls) { public void processClass(ClassHolder cls) {
for (MethodHolder method : cls.getMethods()) { for (MethodHolder method : cls.getMethods()) {
if (dependencyInfo.getAchievableMethods().contains(method.getReference()) && method.getProgram() != null) { if (achievableMethods.contains(method.getReference()) && method.getProgram() != null) {
processMethod(method); processMethod(method);
} }
} }
@ -50,6 +57,7 @@ public class MissingItemsProcessor {
public void processMethod(MethodHolder method) { public void processMethod(MethodHolder method) {
this.methodHolder = method; this.methodHolder = method;
this.program = method.getProgram(); this.program = method.getProgram();
boolean wasModified = false;
for (int i = 0; i < program.basicBlockCount(); ++i) { for (int i = 0; i < program.basicBlockCount(); ++i) {
BasicBlock block = program.basicBlockAt(i); BasicBlock block = program.basicBlockAt(i);
instructionsToAdd.clear(); instructionsToAdd.clear();
@ -57,12 +65,15 @@ public class MissingItemsProcessor {
Instruction insn = block.getInstructions().get(j); Instruction insn = block.getInstructions().get(j);
insn.acceptVisitor(instructionProcessor); insn.acceptVisitor(instructionProcessor);
if (!instructionsToAdd.isEmpty()) { if (!instructionsToAdd.isEmpty()) {
wasModified = true;
truncateBlock(block, j); truncateBlock(block, j);
break; break;
} }
} }
} }
new UnreachableBasicBlockEliminator().optimize(program); if (wasModified) {
new UnreachableBasicBlockEliminator().optimize(program);
}
} }
private void truncateBlock(BasicBlock block, int index) { private void truncateBlock(BasicBlock block, int index) {
@ -108,8 +119,7 @@ public class MissingItemsProcessor {
} }
private boolean checkClass(InstructionLocation location, String className) { private boolean checkClass(InstructionLocation location, String className) {
if (!dependencyInfo.getAchievableClasses().contains(className) || if (!achievableClasses.contains(className) || !dependencyInfo.getClass(className).isMissing()) {
!dependencyInfo.getClass(className).isMissing()) {
return true; return true;
} }
diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Class {{c0}} was not found", diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Class {{c0}} was not found",
@ -132,7 +142,7 @@ public class MissingItemsProcessor {
if (!checkClass(location, method.getClassName())) { if (!checkClass(location, method.getClassName())) {
return false; return false;
} }
if (!dependencyInfo.getAchievableMethods().contains(method) || !dependencyInfo.getMethod(method).isMissing()) { if (!achievableMethods.contains(method) || !dependencyInfo.getMethod(method).isMissing()) {
return true; return true;
} }
diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Method {{m0}} was not found", diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Method {{m0}} was not found",
@ -145,7 +155,7 @@ public class MissingItemsProcessor {
if (!checkClass(location, field.getClassName())) { if (!checkClass(location, field.getClassName())) {
return false; return false;
} }
if (!dependencyInfo.getAchievableFields().contains(field) || !dependencyInfo.getField(field).isMissing()) { if (!achievableFields.contains(field) || !dependencyInfo.getField(field).isMissing()) {
return true; return true;
} }
diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Field {{f0}} was not found", diagnostics.error(new CallLocation(methodHolder.getReference(), location), "Field {{f0}} was not found",