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

Fix NPE in record.equals(null) (#688)

Browse Source
This commit is contained in:
Ivan Hetman 2023-04-11 10:30:21 +03:00 committed by GitHub
parent 3e1edeb90c
commit fcb750675c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classlib/src/main/java/org/teavm/classlib/impl/record/ObjectMethodsSubstitutor.java
View File

@ -54,7 +54,7 @@ public class ObjectMethodsSubstitutor implements BootstrapMethodSubstitutor {
pe.constant(1).propagateTo(result); pe.constant(1).propagateTo(result);
pe.jump(joint); pe.jump(joint);
}); });
ConditionProducer classCondition = () -> thisVar.isNull() ConditionProducer classCondition = () -> thatVar.isNull()
.or(() -> thatVar.invokeVirtual("getClass", Class.class).isNotSame(pe.constant(type))); .or(() -> thatVar.invokeVirtual("getClass", Class.class).isNotSame(pe.constant(type)));
pe.when(classCondition).thenDo(() -> { pe.when(classCondition).thenDo(() -> {
pe.constant(0).propagateTo(result); pe.constant(0).propagateTo(result);

2
tests/src/test/java/org/teavm/vm/RecordTest.java
View File

@ -16,6 +16,7 @@
package org.teavm.vm; package org.teavm.vm;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Test; import org.junit.Test;
@ -26,6 +27,7 @@ import org.teavm.junit.TeaVMTestRunner;
public class RecordTest { public class RecordTest {
@Test @Test
public void equalsMethod() { public void equalsMethod() {
assertFalse(new A(2, "q").equals(null));
assertEquals(new A(2, "q"), new A(2, "q")); assertEquals(new A(2, "q"), new A(2, "q"));
assertNotEquals(new A(2, "q"), new A(3, "q")); assertNotEquals(new A(2, "q"), new A(3, "q"));
assertNotEquals(new A(2, "q"), new A(2, "w")); assertNotEquals(new A(2, "q"), new A(2, "w"));