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 more complex cases of irreducible CFGs during coroutine transformation

Browse Source
This commit is contained in:
Alexey Andreev 2021-03-22 22:09:41 +03:00
parent 9df897d298
commit f2bac088f1
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/org/teavm/backend/lowlevel/transform/CoroutineTransformation.java
View File

@ -15,8 +15,10 @@
*/ */
package org.teavm.backend.lowlevel.transform; package org.teavm.backend.lowlevel.transform;
import com.carrotsearch.hppc.IntHashSet;
import com.carrotsearch.hppc.IntIntHashMap; import com.carrotsearch.hppc.IntIntHashMap;
import com.carrotsearch.hppc.IntIntMap; import com.carrotsearch.hppc.IntIntMap;
import com.carrotsearch.hppc.IntSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.BitSet; import java.util.BitSet;
@ -31,6 +33,7 @@ import org.teavm.common.GraphUtils;
import org.teavm.model.BasicBlock; import org.teavm.model.BasicBlock;
import org.teavm.model.ClassReader; import org.teavm.model.ClassReader;
import org.teavm.model.ClassReaderSource; import org.teavm.model.ClassReaderSource;
import org.teavm.model.Incoming;
import org.teavm.model.Instruction; import org.teavm.model.Instruction;
import org.teavm.model.MethodDescriptor; import org.teavm.model.MethodDescriptor;
import org.teavm.model.MethodReader; import org.teavm.model.MethodReader;
@ -475,6 +478,7 @@ public class CoroutineTransformation {
weights[i] = program.basicBlockAt(i).instructionCount(); weights[i] = program.basicBlockAt(i).instructionCount();
} }
GraphUtils.splitIrreducibleGraph(graph, weights, splittingBackend); GraphUtils.splitIrreducibleGraph(graph, weights, splittingBackend);
new PhiUpdater().updatePhis(program, parameterCount + 1);
} }
class SplittingBackend implements GraphSplittingBackend { class SplittingBackend implements GraphSplittingBackend {
@ -482,14 +486,17 @@ public class CoroutineTransformation {
public int[] split(int[] domain, int[] nodes) { public int[] split(int[] domain, int[] nodes) {
int[] copies = new int[nodes.length]; int[] copies = new int[nodes.length];
IntIntMap map = new IntIntHashMap(); IntIntMap map = new IntIntHashMap();
IntSet nodeSet = IntHashSet.from(nodes);
List<List<Incoming>> outputs = ProgramUtils.getPhiOutputs(program);
for (int i = 0; i < nodes.length; ++i) { for (int i = 0; i < nodes.length; ++i) {
int node = nodes[i]; int node = nodes[i];
BasicBlock block = program.basicBlockAt(node); BasicBlock block = program.basicBlockAt(node);
BasicBlock blockCopy = program.createBasicBlock(); BasicBlock blockCopy = program.createBasicBlock();
ProgramUtils.copyBasicBlock(block, blockCopy); ProgramUtils.copyBasicBlock(block, blockCopy);
copies[i] = blockCopy.getIndex(); copies[i] = blockCopy.getIndex();
map.put(nodes[i], copies[i] + 1); map.put(node, copies[i] + 1);
} }
BasicBlockMapper copyBlockMapper = new BasicBlockMapper((int block) -> { BasicBlockMapper copyBlockMapper = new BasicBlockMapper((int block) -> {
int mappedIndex = map.get(block); int mappedIndex = map.get(block);
return mappedIndex == 0 ? block : mappedIndex - 1; return mappedIndex == 0 ? block : mappedIndex - 1;
@ -498,8 +505,22 @@ public class CoroutineTransformation {
copyBlockMapper.transform(program.basicBlockAt(copy)); copyBlockMapper.transform(program.basicBlockAt(copy));
} }
for (int domainNode : domain) { for (int domainNode : domain) {
copyBlockMapper.transform(program.basicBlockAt(domainNode)); copyBlockMapper.transformWithoutPhis(program.basicBlockAt(domainNode));
} }
for (int i = 0; i < nodes.length; ++i) {
int node = nodes[i];
BasicBlock blockCopy = program.basicBlockAt(copies[i]);
for (Incoming output : outputs.get(node)) {
if (!nodeSet.contains(output.getPhi().getBasicBlock().getIndex())) {
Incoming outputCopy = new Incoming();
outputCopy.setSource(blockCopy);
outputCopy.setValue(output.getValue());
output.getPhi().getIncomings().add(outputCopy);
}
}
}
return copies; return copies;
} }
} }

14
core/src/main/java/org/teavm/model/util/BasicBlockMapper.java
View File

@ -42,16 +42,20 @@ public class BasicBlockMapper extends AbstractInstructionVisitor {
} }
public void transform(BasicBlock block) { public void transform(BasicBlock block) {
Instruction lastInsn = block.getLastInstruction(); transformWithoutPhis(block);
if (lastInsn != null) {
lastInsn.acceptVisitor(this);
}
for (Phi phi : block.getPhis()) { for (Phi phi : block.getPhis()) {
for (Incoming incoming : phi.getIncomings()) { for (Incoming incoming : phi.getIncomings()) {
incoming.setSource(map(incoming.getSource())); incoming.setSource(map(incoming.getSource()));
} }
} }
}
public void transformWithoutPhis(BasicBlock block) {
Instruction lastInsn = block.getLastInstruction();
if (lastInsn != null) {
lastInsn.acceptVisitor(this);
}
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) { for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
tryCatch.setHandler(map(tryCatch.getHandler())); tryCatch.setHandler(map(tryCatch.getHandler()));
} }