eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-18 04:14:50 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Includes catch instruction into interference analysis

Browse Source
This commit is contained in:
konsoletyper 2014-03-31 15:26:20 +04:00
parent f66233c6aa
commit 0deb7ac4e6
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
teavm-core/src/main/java/org/teavm/model/util/InterferenceGraphBuilder.java
View File

@ -50,6 +50,16 @@ class InterferenceGraphBuilder {
for (Incoming outgoing : outgoings.get(i)) { for (Incoming outgoing : outgoings.get(i)) {
live.add(nodes.get(outgoing.getValue().getIndex())); live.add(nodes.get(outgoing.getValue().getIndex()));
} }
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
if (tryCatch.getExceptionVariable() != null) {
nodes.get(tryCatch.getExceptionVariable().getIndex()).connectAll(live);
}
}
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
if (tryCatch.getExceptionVariable() != null) {
live.remove(tryCatch.getExceptionVariable());
}
}
for (int j = block.getInstructions().size() - 1; j >= 0; --j) { for (int j = block.getInstructions().size() - 1; j >= 0; --j) {
Instruction insn = block.getInstructions().get(j); Instruction insn = block.getInstructions().get(j);
insn.acceptVisitor(useExtractor); insn.acceptVisitor(useExtractor);

5
teavm-core/src/main/java/org/teavm/model/util/LivenessAnalyzer.java
View File

@ -66,6 +66,11 @@ public class LivenessAnalyzer {
definitions[var.getIndex()] = i; definitions[var.getIndex()] = i;
} }
} }
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
if (tryCatch.getExceptionVariable() != null) {
definitions[tryCatch.getExceptionVariable().getIndex()] = i;
}
}
for (Phi phi : block.getPhis()) { for (Phi phi : block.getPhis()) {
definitions[phi.getReceiver().getIndex()] = i; definitions[phi.getReceiver().getIndex()] = i;
for (Incoming incoming : phi.getIncomings()) { for (Incoming incoming : phi.getIncomings()) {