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

JS: fix bug in compilation of monitorenter instruction

Browse Source
This commit is contained in:
Alexey Andreev 2021-03-18 14:20:29 +03:00
parent 5d9d64303e
commit 75d06bebbf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
View File

@ -161,7 +161,8 @@ public class AsyncMethodFinder {
} }
if (!hasAsyncMethods && methodRef.getClassName().equals("java.lang.Object") if (!hasAsyncMethods && methodRef.getClassName().equals("java.lang.Object")
&& (methodRef.getName().equals("monitorEnter") || methodRef.getName().equals("monitorExit"))) { && (methodRef.getName().equals("monitorEnter") || methodRef.getName().equals("monitorExit"))
&& methodRef.parameterCount() == 0) {
return; return;
} }
for (CallSite callSite : node.getCallerCallSites()) { for (CallSite callSite : node.getCallerCallSites()) {

4
tests/src/test/java/org/teavm/vm/VMTest.java
View File

@ -433,14 +433,14 @@ public class VMTest {
public synchronized void doWait() { public synchronized void doWait() {
new Thread(() -> { new Thread(() -> {
synchronized (AsyncClinitClass.this) { synchronized (this) {
notify(); notify();
} }
}).start(); }).start();
try { try {
Thread.sleep(1); Thread.sleep(1);
synchronized (AsyncClinitClass.this) { synchronized (this) {
wait(); wait();
} }
} catch (InterruptedException ie) { } catch (InterruptedException ie) {