eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in metaprogramming API

Browse Source
This commit is contained in:
Alexey Andreev 2019-10-07 18:45:43 +03:00
parent 378111d767
commit 92403f9ec0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
metaprogramming/impl/src/main/java/org/teavm/metaprogramming/impl/CompositeMethodGenerator.java
View File

@ -681,6 +681,7 @@ public class CompositeMethodGenerator {
BasicBlock target = program.basicBlockAt(returnBlockIndex); BasicBlock target = program.basicBlockAt(returnBlockIndex);
if (valueToReturn != null) { if (valueToReturn != null) {
Variable valueToReturnResolved = var(valueToReturn);
if (resultVar == null) { if (resultVar == null) {
resultVar = program.createVariable(); resultVar = program.createVariable();
resultPhi = new Phi(); resultPhi = new Phi();
@ -689,7 +690,7 @@ public class CompositeMethodGenerator {
} }
Incoming incoming = new Incoming(); Incoming incoming = new Incoming();
incoming.setSource(program.basicBlockAt(blockIndex)); incoming.setSource(program.basicBlockAt(blockIndex));
incoming.setValue(var(valueToReturn)); incoming.setValue(valueToReturnResolved);
resultPhi.getIncomings().add(incoming); resultPhi.getIncomings().add(incoming);
} }