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

Fix async splitting of blocks with exception handlers in some cases. Fix https://github.com/konsoletyper/teavm/issues/234

Browse Source
This commit is contained in:
Alexey Andreev 2017-01-24 23:36:15 +03:00
parent 5c936878a7
commit 55836d6ed7
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java
View File

@ -35,7 +35,7 @@ class IrreducibleGraphConverter {
private IntSet[] nodeCopies;
private IntegerArray nodeOriginals;
public void convertToReducible(Graph cfg, int[] weight, GraphSplittingBackend backend) {
void convertToReducible(Graph cfg, int[] weight, GraphSplittingBackend backend) {
this.backend = backend;
nodeCopies = new IntOpenHashSet[cfg.size()];

8
core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java
View File

@ -164,12 +164,16 @@ public class AsyncProgramSplitter {
}
for (Part part : parts) {
Graph graph = ProgramUtils.buildControlFlowGraph(part.program);
if (!GraphUtils.isIrreducible(graph)) {
continue;
}
IntegerArray blockSuccessors = IntegerArray.of(part.blockSuccessors);
IntegerArray originalBlocks = IntegerArray.of(part.originalBlocks);
List<Instruction> splitPoints = new ArrayList<>(Arrays.asList(part.splitPoints));
AsyncProgramSplittingBackend splittingBackend = new AsyncProgramSplittingBackend(
new ProgramNodeSplittingBackend(part.program), blockSuccessors, originalBlocks, splitPoints);
Graph graph = ProgramUtils.buildControlFlowGraph(part.program);
int[] weights = new int[graph.size()];
for (int i = 0; i < part.program.basicBlockCount(); ++i) {
weights[i] = part.program.basicBlockAt(i).instructionCount();
@ -278,7 +282,7 @@ public class AsyncProgramSplitter {
private IntegerArray originalBlocks;
private List<Instruction> splitPoints;
public AsyncProgramSplittingBackend(GraphSplittingBackend inner, IntegerArray blockSuccessors,
AsyncProgramSplittingBackend(GraphSplittingBackend inner, IntegerArray blockSuccessors,
IntegerArray originalBlocks, List<Instruction> splitPoints) {
this.inner = inner;
this.blockSuccessors = blockSuccessors;

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

@ -43,10 +43,9 @@ public class BasicBlockMapper extends AbstractInstructionVisitor {
public void transform(BasicBlock block) {
Instruction lastInsn = block.getLastInstruction();
if (lastInsn == null) {
return;
if (lastInsn != null) {
lastInsn.acceptVisitor(this);
}
lastInsn.acceptVisitor(this);
for (Phi phi : block.getPhis()) {
for (Incoming incoming : phi.getIncomings()) {

1
core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java
View File

@ -37,6 +37,7 @@ public class ProgramNodeSplittingBackend implements GraphSplittingBackend {
BasicBlock block = program.basicBlockAt(node);
BasicBlock blockCopy = program.createBasicBlock();
blockCopy.addAll(ProgramUtils.copyInstructions(block.getFirstInstruction(), null, program));
blockCopy.getTryCatchBlocks().addAll(ProgramUtils.copyTryCatches(block, program));
copies[i] = blockCopy.getIndex();
map.put(nodes[i], copies[i] + 1);
}

1
tools/idea/jps-common/teavm-jps-common.iml
View File

@ -17,6 +17,7 @@
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/../../core/src/main/java" />
<root url="file://$MODULE_DIR$/../../../core/src/main/java" />
</SOURCES>
</library>
</orderEntry>