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

Better optimization of <clinit> when reading other's class static final fields

Browse Source
This commit is contained in:
Alexey Andreev 2020-03-02 11:23:58 +03:00
parent a30702aa70
commit 8d1eb3fcc6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import org.teavm.model.BasicBlockReader;
import org.teavm.model.ClassHierarchy; import org.teavm.model.ClassHierarchy;
import org.teavm.model.ClassReader; import org.teavm.model.ClassReader;
import org.teavm.model.ElementModifier; import org.teavm.model.ElementModifier;
import org.teavm.model.FieldReader;
import org.teavm.model.FieldReference; import org.teavm.model.FieldReference;
import org.teavm.model.ListableClassReaderSource; import org.teavm.model.ListableClassReaderSource;
import org.teavm.model.MethodDescriptor; import org.teavm.model.MethodDescriptor;
@ -220,6 +221,13 @@ public class ClassInitializerAnalysis implements ClassInitializerInfo {
@Override @Override
public void putField(VariableReader instance, FieldReference field, VariableReader value, ValueType fieldType) { public void putField(VariableReader instance, FieldReference field, VariableReader value, ValueType fieldType) {
if (instance == null) { if (instance == null) {
ClassReader cls = classes.get(field.getClassName());
if (cls != null) {
FieldReader fieldReader = cls.getField(field.getFieldName());
if (fieldReader != null && fieldReader.hasModifier(ElementModifier.FINAL)) {
return;
}
}
touchField(field); touchField(field);
} }
} }