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

C: fix bug in exception handling

Browse Source
This commit is contained in:
Alexey Andreev 2019-10-31 14:18:29 +03:00
parent 81cc3c156e
commit beef9e09ca
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/teavm/backend/c/generate/CodeGenerationVisitor.java
View File

@ -499,7 +499,7 @@ public class CodeGenerationVisitor implements ExprVisitor, StatementVisitor {
pushLocation(expr.getLocation()); pushLocation(expr.getLocation());
if (needsCallSiteId() && context.getCharacteristics().isManaged(expr.getMethod())) { if (needsCallSiteId() && isManagedMethodCall(context.getCharacteristics(), expr.getMethod())) {
needParenthesis = true; needParenthesis = true;
withCallSite(); withCallSite();
} }

8
core/src/main/java/org/teavm/model/lowlevel/ExceptionHandlingShadowStackContributor.java
View File

@ -283,17 +283,13 @@ public class ExceptionHandlingShadowStackContributor {
|| insn instanceof NullCheckInstruction || insn instanceof BoundCheckInstruction) { || insn instanceof NullCheckInstruction || insn instanceof BoundCheckInstruction) {
return true; return true;
} else if (insn instanceof InvokeInstruction) { } else if (insn instanceof InvokeInstruction) {
MethodReference method = ((InvokeInstruction) insn).getMethod(); return isManagedMethodCall(characteristics, ((InvokeInstruction) insn).getMethod());
if (method.equals(FILL_STACK_TRACE)) {
return true;
}
return isManagedMethodCall(characteristics, method);
} }
return false; return false;
} }
public static boolean isManagedMethodCall(Characteristics characteristics, MethodReference method) { public static boolean isManagedMethodCall(Characteristics characteristics, MethodReference method) {
if (characteristics.isManaged(method)) { if (characteristics.isManaged(method) || method.equals(FILL_STACK_TRACE)) {
return true; return true;
} }
return method.getClassName().equals(ExceptionHandling.class.getName()) return method.getClassName().equals(ExceptionHandling.class.getName())