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 compile-time error when callable reference requires boxing

Browse Source
This commit is contained in:
Alexey Andreev 2017-11-25 20:31:57 +03:00
parent a7ac256c47
commit a20d0b0855
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/teavm/model/emit/ValueEmitter.java
View File

@ -714,7 +714,7 @@ public class ValueEmitter {
return value; return value;
} else { } else {
if (this.type instanceof ValueType.Primitive) { if (this.type instanceof ValueType.Primitive) {
throw new EmitException("Can't convert " + this.type + " to " + type); return boxPrimitive(type);
} }
Variable result = pe.getProgram().createVariable(); Variable result = pe.getProgram().createVariable();
CastInstruction insn = new CastInstruction(); CastInstruction insn = new CastInstruction();
@ -726,6 +726,25 @@ public class ValueEmitter {
} }
} }
private ValueEmitter boxPrimitive(ValueType type) {
if (!(type instanceof ValueType.Object)) {
throw new EmitException("Can't convert " + this.type + " to " + type);
}
String targetClass = ((ValueType.Object) type).getClassName();
PrimitiveType primitiveType = ((ValueType.Primitive) this.type).getKind();
String boxClassName = getPrimitiveClassName(primitiveType);
ValueEmitter result = invokeValueOf(boxClassName);
if (!pe.getClassSource().isSuperType(targetClass, boxClassName).orElse(false)) {
throw new EmitException("Can't convert " + this.type + " to " + targetClass);
}
return result;
}
private ValueEmitter invokeValueOf(String cls) {
return pe.invoke(cls, "valueOf", ValueType.object(cls), this);
}
public ValueEmitter cast(NumericOperandType to) { public ValueEmitter cast(NumericOperandType to) {
if (!(type instanceof ValueType.Primitive)) { if (!(type instanceof ValueType.Primitive)) {
throw new EmitException("Can't cast non-primitive type: " + type); throw new EmitException("Can't cast non-primitive type: " + type);
@ -741,7 +760,7 @@ public class ValueEmitter {
ValueEmitter result = pe.newVar(ValueType.INTEGER); ValueEmitter result = pe.newVar(ValueType.INTEGER);
CastNumberInstruction insn = new CastNumberInstruction(convertToNumeric(kind), to); CastNumberInstruction insn = new CastNumberInstruction(convertToNumeric(kind), to);
insn.setValue(variable); insn.setValue(value.variable);
insn.setReceiver(result.getVariable()); insn.setReceiver(result.getVariable());
pe.addInstruction(insn); pe.addInstruction(insn);