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 issue in optimization

Browse Source
This commit is contained in:
Alexey Andreev 2023-07-31 19:29:41 +02:00
parent 2143a103f1
commit 059281a25c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/teavm/model/optimization/SystemArrayCopyOptimization.java
View File

@ -27,10 +27,11 @@ public class SystemArrayCopyOptimization implements MethodOptimization {
"arraycopy", Object.class, int.class, Object.class, int.class, int.class, void.class); "arraycopy", Object.class, int.class, Object.class, int.class, int.class, void.class);
private static final MethodReference FAST_ARRAY_COPY_METHOD = new MethodReference(System.class, private static final MethodReference FAST_ARRAY_COPY_METHOD = new MethodReference(System.class,
"fastArraycopy", Object.class, int.class, Object.class, int.class, int.class, void.class); "fastArraycopy", Object.class, int.class, Object.class, int.class, int.class, void.class);
private static final ValueType DEFAULT_TYPE = ValueType.object("java.lang.Object");
@Override @Override
public boolean optimize(MethodOptimizationContext context, Program program) { public boolean optimize(MethodOptimizationContext context, Program program) {
TypeInference typeInference = null; var typeInference = new TypeInference(program, context.getMethod().getReference());
var somethingChanged = false; var somethingChanged = false;
for (var block : program.getBasicBlocks()) { for (var block : program.getBasicBlocks()) {
for (var instruction : block) { for (var instruction : block) {
@ -38,12 +39,9 @@ public class SystemArrayCopyOptimization implements MethodOptimization {
var invoke = (InvokeInstruction) instruction; var invoke = (InvokeInstruction) instruction;
var method = invoke.getMethod(); var method = invoke.getMethod();
if (method.equals(ARRAY_COPY_METHOD)) { if (method.equals(ARRAY_COPY_METHOD)) {
if (typeInference == null) {
typeInference = new TypeInference(program, context.getMethod().getReference());
}
var sourceType = typeInference.typeOf(invoke.getArguments().get(0)); var sourceType = typeInference.typeOf(invoke.getArguments().get(0));
var destType = typeInference.typeOf(invoke.getArguments().get(2)); var destType = typeInference.typeOf(invoke.getArguments().get(2));
if (sourceType != null && destType != null) { if (sourceType instanceof ValueType.Array && destType instanceof ValueType.Array) {
if (sourceType.equals(destType) if (sourceType.equals(destType)
|| context.getHierarchy().isSuperType(destType, sourceType, false)) { || context.getHierarchy().isSuperType(destType, sourceType, false)) {
invoke.setMethod(FAST_ARRAY_COPY_METHOD); invoke.setMethod(FAST_ARRAY_COPY_METHOD);
@ -65,24 +63,24 @@ public class SystemArrayCopyOptimization implements MethodOptimization {
@Override @Override
public ValueType merge(ValueType a, ValueType b) { public ValueType merge(ValueType a, ValueType b) {
if (!Objects.equals(a, b)) { if (!Objects.equals(a, b)) {
return null; return DEFAULT_TYPE;
} }
return a; return a;
} }
@Override @Override
public ValueType elementType(ValueType valueType) { public ValueType elementType(ValueType valueType) {
return valueType instanceof ValueType.Array ? ((ValueType.Array) valueType).getItemType() : null; return valueType instanceof ValueType.Array ? ((ValueType.Array) valueType).getItemType() : DEFAULT_TYPE;
} }
@Override @Override
public ValueType nullType() { public ValueType nullType() {
return null; return DEFAULT_TYPE;
} }
@Override @Override
public ValueType mapType(ValueType type) { public ValueType mapType(ValueType type) {
return type instanceof ValueType.Array ? ((ValueType.Array) type).getItemType() : null; return type instanceof ValueType.Array ? type : DEFAULT_TYPE;
} }
} }
} }