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

Do not insert GC write barriers when value assigned to field is known to be null or constant literal

Browse Source
This commit is contained in:
Alexey Andreev 2019-12-05 15:36:32 +03:00
parent 72fc62f082
commit 9d0a53175a
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/org/teavm/model/lowlevel/WriteBarrierInsertion.java
View File

@ -30,6 +30,7 @@ import org.teavm.model.instructions.AbstractInstructionVisitor;
import org.teavm.model.instructions.ArrayElementType; import org.teavm.model.instructions.ArrayElementType;
import org.teavm.model.instructions.AssignInstruction; import org.teavm.model.instructions.AssignInstruction;
import org.teavm.model.instructions.CastInstruction; import org.teavm.model.instructions.CastInstruction;
import org.teavm.model.instructions.ClassConstantInstruction;
import org.teavm.model.instructions.CloneArrayInstruction; import org.teavm.model.instructions.CloneArrayInstruction;
import org.teavm.model.instructions.ConstructArrayInstruction; import org.teavm.model.instructions.ConstructArrayInstruction;
import org.teavm.model.instructions.ConstructInstruction; import org.teavm.model.instructions.ConstructInstruction;
@ -40,8 +41,10 @@ import org.teavm.model.instructions.InvokeInstruction;
import org.teavm.model.instructions.MonitorEnterInstruction; import org.teavm.model.instructions.MonitorEnterInstruction;
import org.teavm.model.instructions.MonitorExitInstruction; import org.teavm.model.instructions.MonitorExitInstruction;
import org.teavm.model.instructions.NullCheckInstruction; import org.teavm.model.instructions.NullCheckInstruction;
import org.teavm.model.instructions.NullConstantInstruction;
import org.teavm.model.instructions.PutElementInstruction; import org.teavm.model.instructions.PutElementInstruction;
import org.teavm.model.instructions.PutFieldInstruction; import org.teavm.model.instructions.PutFieldInstruction;
import org.teavm.model.instructions.StringConstantInstruction;
import org.teavm.model.util.DominatorWalker; import org.teavm.model.util.DominatorWalker;
import org.teavm.model.util.DominatorWalkerCallback; import org.teavm.model.util.DominatorWalkerCallback;
import org.teavm.model.util.DominatorWalkerContext; import org.teavm.model.util.DominatorWalkerContext;
@ -61,14 +64,19 @@ public class WriteBarrierInsertion {
if (program.basicBlockCount() == 0) { if (program.basicBlockCount() == 0) {
return; return;
} }
new DominatorWalker(program).walk(new WalkerCallbackImpl()); new DominatorWalker(program).walk(new WalkerCallbackImpl(program.variableCount()));
} }
class WalkerCallbackImpl extends AbstractInstructionVisitor implements DominatorWalkerCallback<State> { class WalkerCallbackImpl extends AbstractInstructionVisitor implements DominatorWalkerCallback<State> {
private DominatorWalkerContext context; private DominatorWalkerContext context;
private boolean[] constantVariables;
IntHashSet installedBarriers = new IntHashSet(); IntHashSet installedBarriers = new IntHashSet();
State state; State state;
WalkerCallbackImpl(int variableCount) {
constantVariables = new boolean[variableCount];
}
@Override @Override
public void setContext(DominatorWalkerContext context) { public void setContext(DominatorWalkerContext context) {
this.context = context; this.context = context;
@ -108,10 +116,25 @@ public class WriteBarrierInsertion {
} }
} }
@Override
public void visit(NullConstantInstruction insn) {
constantVariables[insn.getReceiver().getIndex()] = true;
}
@Override
public void visit(ClassConstantInstruction insn) {
constantVariables[insn.getReceiver().getIndex()] = true;
}
@Override
public void visit(StringConstantInstruction insn) {
constantVariables[insn.getReceiver().getIndex()] = true;
}
@Override @Override
public void visit(PutFieldInstruction insn) { public void visit(PutFieldInstruction insn) {
if (insn.getInstance() != null && isManagedReferenceType(insn.getFieldType())) { if (insn.getInstance() != null && isManagedReferenceType(insn.getFieldType())) {
installBarrier(insn, insn.getInstance()); installBarrier(insn, insn.getInstance(), insn.getValue());
} }
} }
@ -169,7 +192,7 @@ public class WriteBarrierInsertion {
@Override @Override
public void visit(PutElementInstruction insn) { public void visit(PutElementInstruction insn) {
if (insn.getType() == ArrayElementType.OBJECT) { if (insn.getType() == ArrayElementType.OBJECT) {
installBarrier(insn, insn.getArray()); installBarrier(insn, insn.getArray(), insn.getValue());
} }
} }
@ -192,9 +215,15 @@ public class WriteBarrierInsertion {
if (installedBarriers.contains(from.getIndex())) { if (installedBarriers.contains(from.getIndex())) {
markAsInstalled(to.getIndex()); markAsInstalled(to.getIndex());
} }
if (constantVariables[from.getIndex()]) {
constantVariables[to.getIndex()] = true;
}
} }
private void installBarrier(Instruction instruction, Variable variable) { private void installBarrier(Instruction instruction, Variable variable, Variable value) {
if (constantVariables[value.getIndex()]) {
return;
}
if (markAsInstalled(variable.getIndex())) { if (markAsInstalled(variable.getIndex())) {
InvokeInstruction invoke = new InvokeInstruction(); InvokeInstruction invoke = new InvokeInstruction();
invoke.setType(InvocationType.SPECIAL); invoke.setType(InvocationType.SPECIAL);