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

Limit depth of method analysis in class initializer analysis in order to avoid too deep stack (and therefore SOE)

Browse Source
This commit is contained in:
Alexey Andreev 2024-07-11 18:18:24 +02:00
parent 7efb3c97a0
commit 025801d385
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/teavm/model/analysis/ClassInitializerAnalysis.java
View File

@ -43,6 +43,7 @@ import org.teavm.model.optimization.Devirtualization;
public class ClassInitializerAnalysis implements ClassInitializerInfo { public class ClassInitializerAnalysis implements ClassInitializerInfo {
private static final MethodDescriptor CLINIT = new MethodDescriptor("<clinit>", void.class); private static final MethodDescriptor CLINIT = new MethodDescriptor("<clinit>", void.class);
private static final int METHOD_ANALYSIS_DEPTH_THRESHOLD = 250;
private static final byte BEING_ANALYZED = 1; private static final byte BEING_ANALYZED = 1;
private static final byte DYNAMIC = 2; private static final byte DYNAMIC = 2;
private static final byte STATIC = 3; private static final byte STATIC = 3;
@ -55,6 +56,7 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
private List<? extends String> readonlyOrder = Collections.unmodifiableList(order); private List<? extends String> readonlyOrder = Collections.unmodifiableList(order);
private String currentAnalyzedClass; private String currentAnalyzedClass;
private DependencyInfo dependencyInfo; private DependencyInfo dependencyInfo;
private int methodAnalysisDepth;
public ClassInitializerAnalysis(ListableClassReaderSource classes, ClassHierarchy hierarchy, public ClassInitializerAnalysis(ListableClassReaderSource classes, ClassHierarchy hierarchy,
String entryPoint) { String entryPoint) {
@ -121,9 +123,13 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
var initializer = cls.getMethod(CLINIT); var initializer = cls.getMethod(CLINIT);
var isStatic = true; var isStatic = true;
if (initializer != null) { if (initializer != null) {
var initializerInfo = analyzeMethod(initializer); if (methodAnalysisDepth >= METHOD_ANALYSIS_DEPTH_THRESHOLD) {
if (isDynamicInitializer(initializerInfo, className)) {
isStatic = false; isStatic = false;
} else {
var initializerInfo = analyzeMethod(initializer);
if (isDynamicInitializer(initializerInfo, className)) {
isStatic = false;
}
} }
} }
@ -151,6 +157,7 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
} }
private MethodInfo analyzeMethod(MethodReader method) { private MethodInfo analyzeMethod(MethodReader method) {
methodAnalysisDepth++;
var methodInfo = methodInfoMap.get(method.getReference()); var methodInfo = methodInfoMap.get(method.getReference());
if (methodInfo == null) { if (methodInfo == null) {
methodInfo = new MethodInfo(method.getReference()); methodInfo = new MethodInfo(method.getReference());
@ -174,6 +181,7 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
methodInfo.complete = true; methodInfo.complete = true;
} }
--methodAnalysisDepth;
return methodInfo; return methodInfo;
} }
@ -264,9 +272,14 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
private void invokeMethod(MethodReference method) { private void invokeMethod(MethodReference method) {
var cls = classes.get(method.getClassName()); var cls = classes.get(method.getClassName());
if (cls != null) { if (cls != null) {
var methodReader = cls.getMethod(method.getDescriptor()); if (methodAnalysisDepth >= METHOD_ANALYSIS_DEPTH_THRESHOLD) {
if (methodReader != null) { methodInfo.anyFieldModified = true;
analyzeCalledMethod(analyzeMethod(methodReader)); methodInfo.classesWithModifiedFields = null;
} else {
var methodReader = cls.getMethod(method.getDescriptor());
if (methodReader != null) {
analyzeCalledMethod(analyzeMethod(methodReader));
}
} }
} }
} }