mirror/teavm
2
0
Fork 0
mirror of https://github.com/konsoletyper/teavm.git synced 2024-11-27 01:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix converting method to state machine in some cases. Fix #366

Browse Source
This commit is contained in:
Alexey Andreev 2018-11-25 18:46:45 +03:00
parent a3dfc0c486
commit b018e61615
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/main/java/org/teavm/model/util/AsyncProgramSplitter.java
View File

@ -40,6 +40,7 @@ import org.teavm.model.TryCatchBlock;
import org.teavm.model.ValueType;
import org.teavm.model.Variable;
import org.teavm.model.instructions.InitClassInstruction;
import org.teavm.model.instructions.InvocationType;
import org.teavm.model.instructions.InvokeInstruction;
import org.teavm.model.instructions.JumpInstruction;
import org.teavm.model.instructions.MonitorEnterInstruction;
@ -82,8 +83,14 @@ public class AsyncProgramSplitter {
for (Instruction insn : sourceBlock) {
if (insn instanceof InvokeInstruction) {
InvokeInstruction invoke = (InvokeInstruction) insn;
if (!asyncMethods.contains(findRealMethod(invoke.getMethod()))) {
continue;
if (invoke.getType() == InvocationType.VIRTUAL) {
if (!isAsyncMethod(findRealMethod(invoke.getMethod()))) {
continue;
}
} else {
if (!asyncMethods.contains(findRealMethod(invoke.getMethod()))) {
continue;
}
}
} else if (insn instanceof InitClassInstruction) {
if (!isSplittingClassInitializer(((InitClassInstruction) insn).getClassName())) {
@ -227,6 +234,33 @@ public class AsyncProgramSplitter {
return method;
}
private boolean isAsyncMethod(MethodReference method) {
if (asyncMethods.isEmpty()) {
return false;
}
if (asyncMethods.contains(method)) {
return true;
}
ClassReader cls = classSource.get(method.getClassName());
if (cls == null) {
return false;
}
if (cls.getParent() != null) {
if (isAsyncMethod(new MethodReference(cls.getParent(), method.getDescriptor()))) {
return true;
}
}
for (String itf : cls.getInterfaces()) {
if (isAsyncMethod(new MethodReference(itf, method.getDescriptor()))) {
return true;
}
}
return false;
}
private Program createStubCopy(Program program) {
Program copy = new Program();
for (int i = 0; i < program.basicBlockCount(); ++i) {