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

C: fix incorrect phi placement after some IR transformations

Browse Source
This commit is contained in:
Alexey Andreev 2019-07-05 18:24:59 +03:00
parent c031e11107
commit 8667b98af5
2 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
core/src/main/java/org/teavm/model/lowlevel/ClassInitializerTransformer.java
View File

@ -16,11 +16,10 @@
package org.teavm.model.lowlevel; package org.teavm.model.lowlevel;
import org.teavm.model.BasicBlock; import org.teavm.model.BasicBlock;
import org.teavm.model.Incoming;
import org.teavm.model.Instruction; import org.teavm.model.Instruction;
import org.teavm.model.MethodReference; import org.teavm.model.MethodReference;
import org.teavm.model.Phi;
import org.teavm.model.Program; import org.teavm.model.Program;
import org.teavm.model.TextLocation;
import org.teavm.model.ValueType; import org.teavm.model.ValueType;
import org.teavm.model.Variable; import org.teavm.model.Variable;
import org.teavm.model.instructions.BranchingCondition; import org.teavm.model.instructions.BranchingCondition;
@ -30,66 +29,55 @@ import org.teavm.model.instructions.InitClassInstruction;
import org.teavm.model.instructions.InvocationType; import org.teavm.model.instructions.InvocationType;
import org.teavm.model.instructions.InvokeInstruction; import org.teavm.model.instructions.InvokeInstruction;
import org.teavm.model.instructions.JumpInstruction; import org.teavm.model.instructions.JumpInstruction;
import org.teavm.model.util.ProgramUtils; import org.teavm.model.util.BasicBlockSplitter;
import org.teavm.runtime.Allocator; import org.teavm.runtime.Allocator;
public class ClassInitializerTransformer { public class ClassInitializerTransformer {
public void transform(Program program) { public void transform(Program program) {
int[] basicBlockMap = new int[program.basicBlockCount()]; BasicBlockSplitter splitter = new BasicBlockSplitter(program);
for (int i = 0; i < basicBlockMap.length; ++i) {
basicBlockMap[i] = i;
}
for (int i = 0; i < basicBlockMap.length; ++i) { int count = program.basicBlockCount();
BasicBlock block = program.basicBlockAt(i); for (int i = 0; i < count; ++i) {
for (Instruction instruction : block) { BasicBlock next = program.basicBlockAt(i);
if (!(instruction instanceof InitClassInstruction)) { BasicBlock block;
continue; while (next != null) {
} block = next;
String className = ((InitClassInstruction) instruction).getClassName(); next = null;
block = instruction.getBasicBlock(); for (Instruction instruction : block) {
if (!(instruction instanceof InitClassInstruction)) {
continue;
}
String className = ((InitClassInstruction) instruction).getClassName();
BasicBlock continueBlock = program.createBasicBlock(); BasicBlock continueBlock = splitter.split(block, instruction);
while (instruction.getNext() != null) {
Instruction toMove = instruction.getNext();
toMove.delete();
continueBlock.add(toMove);
}
continueBlock.getTryCatchBlocks().addAll(ProgramUtils.copyTryCatches(block, program));
BasicBlock initBlock = program.createBasicBlock(); BasicBlock initBlock = program.createBasicBlock();
instruction.delete(); instruction.delete();
initBlock.add(instruction); initBlock.add(instruction);
JumpInstruction jumpToContinue = new JumpInstruction(); JumpInstruction jumpToContinue = new JumpInstruction();
jumpToContinue.setTarget(continueBlock); jumpToContinue.setTarget(continueBlock);
initBlock.add(jumpToContinue); initBlock.add(jumpToContinue);
createInitCheck(program, block, className, continueBlock, initBlock); createInitCheck(program, block, className, continueBlock, initBlock, instruction.getLocation());
basicBlockMap[i] = continueBlock.getIndex(); next = continueBlock;
} break;
}
for (int i = 0; i < basicBlockMap.length; ++i) {
BasicBlock block = program.basicBlockAt(i);
for (Phi phi : block.getPhis()) {
for (Incoming incoming : phi.getIncomings()) {
int source = incoming.getSource().getIndex();
BasicBlock mappedSource = program.basicBlockAt(basicBlockMap[source]);
incoming.setSource(mappedSource);
} }
} }
} }
splitter.fixProgram();
} }
private void createInitCheck(Program program, BasicBlock block, String className, BasicBlock continueBlock, private void createInitCheck(Program program, BasicBlock block, String className, BasicBlock continueBlock,
BasicBlock initBlock) { BasicBlock initBlock, TextLocation location) {
Variable clsVariable = program.createVariable(); Variable clsVariable = program.createVariable();
Variable initializedVariable = program.createVariable(); Variable initializedVariable = program.createVariable();
ClassConstantInstruction clsConstant = new ClassConstantInstruction(); ClassConstantInstruction clsConstant = new ClassConstantInstruction();
clsConstant.setReceiver(clsVariable); clsConstant.setReceiver(clsVariable);
clsConstant.setConstant(ValueType.object(className)); clsConstant.setConstant(ValueType.object(className));
clsConstant.setLocation(location);
block.add(clsConstant); block.add(clsConstant);
InvokeInstruction checkInitialized = new InvokeInstruction(); InvokeInstruction checkInitialized = new InvokeInstruction();
@ -97,12 +85,14 @@ public class ClassInitializerTransformer {
checkInitialized.setMethod(new MethodReference(Allocator.class, "isInitialized", Class.class, boolean.class)); checkInitialized.setMethod(new MethodReference(Allocator.class, "isInitialized", Class.class, boolean.class));
checkInitialized.setArguments(clsVariable); checkInitialized.setArguments(clsVariable);
checkInitialized.setReceiver(initializedVariable); checkInitialized.setReceiver(initializedVariable);
checkInitialized.setLocation(location);
block.add(checkInitialized); block.add(checkInitialized);
BranchingInstruction branching = new BranchingInstruction(BranchingCondition.NOT_EQUAL); BranchingInstruction branching = new BranchingInstruction(BranchingCondition.NOT_EQUAL);
branching.setOperand(initializedVariable); branching.setOperand(initializedVariable);
branching.setConsequent(continueBlock); branching.setConsequent(continueBlock);
branching.setAlternative(initBlock); branching.setAlternative(initBlock);
branching.setLocation(location);
block.add(branching); block.add(branching);
} }
} }

35
core/src/main/java/org/teavm/model/lowlevel/ExceptionHandlingShadowStackContributor.java
View File

@ -16,6 +16,8 @@
package org.teavm.model.lowlevel; package org.teavm.model.lowlevel;
import com.carrotsearch.hppc.IntHashSet; import com.carrotsearch.hppc.IntHashSet;
import com.carrotsearch.hppc.IntObjectHashMap;
import com.carrotsearch.hppc.IntObjectMap;
import com.carrotsearch.hppc.IntSet; import com.carrotsearch.hppc.IntSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -136,13 +138,15 @@ public class ExceptionHandlingShadowStackContributor {
private int contributeToBasicBlock(BasicBlock block) { private int contributeToBasicBlock(BasicBlock block) {
int[] currentJointSources = new int[program.variableCount()]; int[] currentJointSources = new int[program.variableCount()];
int[] jointReceiverMap = new int[program.variableCount()]; IntObjectMap<int[]> jointReceiverMaps = new IntObjectHashMap<>();
Arrays.fill(currentJointSources, -1); Arrays.fill(currentJointSources, -1);
Arrays.fill(jointReceiverMap, -1);
IntSet outgoingVariablesToRemove = new IntHashSet(); IntSet outgoingVariablesToRemove = new IntHashSet();
IntSet variablesDefinedHere = new IntHashSet(); IntSet variablesDefinedHere = new IntHashSet();
for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) { for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
int[] jointReceiverMap = new int[program.variableCount()];
Arrays.fill(jointReceiverMap, -1);
for (Phi phi : tryCatch.getHandler().getPhis()) { for (Phi phi : tryCatch.getHandler().getPhis()) {
List<Variable> sourceVariables = phi.getIncomings().stream() List<Variable> sourceVariables = phi.getIncomings().stream()
.filter(incoming -> incoming.getSource() == tryCatch.getProtectedBlock()) .filter(incoming -> incoming.getSource() == tryCatch.getProtectedBlock())
@ -155,15 +159,20 @@ public class ExceptionHandlingShadowStackContributor {
for (Variable sourceVar : sourceVariables) { for (Variable sourceVar : sourceVariables) {
BasicBlock sourceVarDefinedAt = variableDefinitionPlaces[sourceVar.getIndex()]; BasicBlock sourceVarDefinedAt = variableDefinitionPlaces[sourceVar.getIndex()];
if (sourceVar.getIndex() < parameterCount if (sourceVar.getIndex() < parameterCount
|| dom.dominates(sourceVarDefinedAt.getIndex(), block.getIndex())) { || (dom.dominates(sourceVarDefinedAt.getIndex(), block.getIndex())
&& block != sourceVarDefinedAt)) {
currentJointSources[phi.getReceiver().getIndex()] = sourceVar.getIndex(); currentJointSources[phi.getReceiver().getIndex()] = sourceVar.getIndex();
break; if (sourceVarDefinedAt != block) {
break;
}
} }
} }
for (Variable sourceVar : sourceVariables) { for (Variable sourceVar : sourceVariables) {
jointReceiverMap[sourceVar.getIndex()] = phi.getReceiver().getIndex(); jointReceiverMap[sourceVar.getIndex()] = phi.getReceiver().getIndex();
} }
} }
jointReceiverMaps.put(tryCatch.getHandler().getIndex(), jointReceiverMap);
} }
DefinitionExtractor defExtractor = new DefinitionExtractor(); DefinitionExtractor defExtractor = new DefinitionExtractor();
@ -235,17 +244,19 @@ public class ExceptionHandlingShadowStackContributor {
insn.acceptVisitor(defExtractor); insn.acceptVisitor(defExtractor);
for (Variable definedVar : defExtractor.getDefinedVariables()) { for (Variable definedVar : defExtractor.getDefinedVariables()) {
int jointReceiver = jointReceiverMap[definedVar.getIndex()]; for (TryCatchBlock tryCatch : block.getTryCatchBlocks()) {
if (jointReceiver >= 0) { int jointReceiver = jointReceiverMaps.get(tryCatch.getHandler().getIndex())[definedVar.getIndex()];
int formerVar = currentJointSources[jointReceiver]; if (jointReceiver >= 0) {
if (formerVar >= 0) { int formerVar = currentJointSources[jointReceiver];
if (variableDefinitionPlaces[formerVar] == initialBlock) { if (formerVar >= 0) {
outgoingVariablesToRemove.add(formerVar); if (variableDefinitionPlaces[formerVar] == initialBlock) {
outgoingVariablesToRemove.add(formerVar);
}
} }
currentJointSources[jointReceiver] = definedVar.getIndex();
} }
currentJointSources[jointReceiver] = definedVar.getIndex();
variablesDefinedHere.add(definedVar.getIndex());
} }
variablesDefinedHere.add(definedVar.getIndex());
} }
} }