Fix mapping stats not skipping anonymous classes #469
Conversation
Adds indexing of inner & enclosing classes, since it's the only way to properly detect an anonymous class
enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java
Outdated
Show resolved
Hide resolved
| import cuchaz.enigma.translation.representation.entry.ClassEntry; | ||
|
|
||
| public class InnerClassIndex implements JarIndexer { | ||
| private Multimap<ClassDefEntry, InnerClassData> innerClasses = ArrayListMultimap.create(); |
There was a problem hiding this comment.
This thing is wrong; we don't want to record one map entry for every MethodHandles.Lookup reference. To check if a class is an anonymous class, simply check its EnclosingMethods https://docs.oracle.com/javase/specs/jvms/se19/html/jvms-4.html#jvms-4.7.7 which asm somehow calls "OuterClass" and describes it incorrectly
| } | ||
| } | ||
|
|
||
| record OuterClassData(String owner, String name, String descriptor) { |
There was a problem hiding this comment.
These names are wrong names from ASM, should've been like EnclosingMethodData. Also hasEnclosingMethod is wrong too; it returns that whether the given class is enclosed in a regular method instead of <init> or <clinit> (read the italics in https://docs.oracle.com/javase/specs/jvms/se19/html/jvms-4.html#jvms-4.7.7)
This reverts commit f992016.
|
I'm going to commit the filtering of packages in a separate PR |
NebelNidas
changed the title
Taken from
QuiltMC/enigma@a1892c0 andQuiltMC/enigma@fbd2753.