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

wasm gc: fix issues with switch expression

Browse Source
This commit is contained in:
Alexey Andreev 2024-09-16 20:25:12 +02:00
parent 7784969bb8
commit 07b45fbec7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classlib/src/main/java/org/teavm/classlib/impl/SwitchBootstrapSubstitutor.java
View File

@ -89,14 +89,14 @@ public class SwitchBootstrapSubstitutor implements BootstrapMethodSubstitutor {
int val = label.getInt(); int val = label.getInt();
pe.when(() -> target.instanceOf(ValueType.object("java.lang.Number")).isTrue() pe.when(() -> target.instanceOf(ValueType.object("java.lang.Number")).isTrue()
.and(() -> target.cast(Number.class) .and(() -> target.cast(Number.class)
.invokeVirtual("intValue", int.class).isSame(pe.constant(val)))) .invokeVirtual("intValue", int.class).isEqualTo(pe.constant(val))))
.thenDo(() -> { .thenDo(() -> {
pe.constant(idx).propagateTo(result); pe.constant(idx).propagateTo(result);
pe.jump(exit); pe.jump(exit);
}); });
pe.when(() -> target.instanceOf(ValueType.object("java.lang.Character")).isTrue() pe.when(() -> target.instanceOf(ValueType.object("java.lang.Character")).isTrue()
.and(() -> target.cast(Character.class) .and(() -> target.cast(Character.class)
.invokeSpecial("charValue", char.class).isSame(pe.constant(val)))) .invokeSpecial("charValue", char.class).isEqualTo(pe.constant(val))))
.thenDo(() -> { .thenDo(() -> {
pe.constant(idx).propagateTo(result); pe.constant(idx).propagateTo(result);
pe.jump(exit); pe.jump(exit);
@ -106,7 +106,8 @@ public class SwitchBootstrapSubstitutor implements BootstrapMethodSubstitutor {
String str = label.getString(); String str = label.getString();
pe.when(enumType != null pe.when(enumType != null
? () -> pe.getField(enumType.getClassName(), str, enumType).isSame(target) ? () -> pe.getField(enumType.getClassName(), str, enumType).isSame(target)
: () -> pe.constant(str).isEqualTo(target)) : () -> pe.constant(str).invokeVirtual("equals", boolean.class,
target.cast(Object.class)).isTrue())
.thenDo(() -> { .thenDo(() -> {
pe.constant(idx).propagateTo(result); pe.constant(idx).propagateTo(result);
pe.jump(exit); pe.jump(exit);