De-duplicate inherited member set creation

Signed-off-by: Graham <gpe@openrs2.dev>
bzip2
Graham 5 years ago
parent d57cf15bd3
commit e6461176b7
  1. 79
      asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt

@ -93,69 +93,32 @@ class ClassPath(
} }
fun createInheritedFieldSets(): DisjointSet<MemberRef> { fun createInheritedFieldSets(): DisjointSet<MemberRef> {
val disjointSet = ForestDisjointSet<MemberRef>() return createInheritedMemberSets(ClassMetadata::fields, ClassMetadata::getFieldAccess)
val ancestorCache = mutableMapOf<ClassMetadata, Set<MemberDesc>>()
for (library in libraries) {
for (clazz in library) {
populateInheritedFieldSets(ancestorCache, disjointSet, get(clazz.name)!!)
}
}
return disjointSet
} }
private fun populateInheritedFieldSets( fun createInheritedMethodSets(): DisjointSet<MemberRef> {
ancestorCache: MutableMap<ClassMetadata, Set<MemberDesc>>, return createInheritedMemberSets(ClassMetadata::methods, ClassMetadata::getMethodAccess)
disjointSet: DisjointSet<MemberRef>,
clazz: ClassMetadata
): Set<MemberDesc> {
val ancestors = ancestorCache[clazz]
if (ancestors != null) {
return ancestors
}
val ancestorsBuilder = mutableSetOf<MemberDesc>()
for (superClass in clazz.superClassAndInterfaces) {
val fields = populateInheritedFieldSets(ancestorCache, disjointSet, superClass)
for (field in fields) {
val access = clazz.getFieldAccess(field)
if (access != null && access and Opcodes.ACC_STATIC != 0) {
continue
}
val partition1 = disjointSet.add(MemberRef(clazz.name, field))
val partition2 = disjointSet.add(MemberRef(superClass.name, field))
disjointSet.union(partition1, partition2)
ancestorsBuilder.add(field)
}
}
for (field in clazz.fields) {
disjointSet.add(MemberRef(clazz.name, field))
ancestorsBuilder.add(field)
}
ancestorCache[clazz] = ancestorsBuilder
return ancestorsBuilder
} }
fun createInheritedMethodSets(): DisjointSet<MemberRef> { private fun createInheritedMemberSets(
getMembers: (ClassMetadata) -> List<MemberDesc>,
getMemberAccess: (ClassMetadata, MemberDesc) -> Int?
): DisjointSet<MemberRef> {
val disjointSet = ForestDisjointSet<MemberRef>() val disjointSet = ForestDisjointSet<MemberRef>()
val ancestorCache = mutableMapOf<ClassMetadata, Set<MemberDesc>>() val ancestorCache = mutableMapOf<ClassMetadata, Set<MemberDesc>>()
for (library in libraries) { for (library in libraries) {
for (clazz in library) { for (clazz in library) {
populateInheritedMethodSets(ancestorCache, disjointSet, get(clazz.name)!!) populateInheritedMemberSets(getMembers, getMemberAccess, ancestorCache, disjointSet, get(clazz.name)!!)
} }
} }
return disjointSet return disjointSet
} }
private fun populateInheritedMethodSets( private fun populateInheritedMemberSets(
getMembers: (ClassMetadata) -> List<MemberDesc>,
getMemberAccess: (ClassMetadata, MemberDesc) -> Int?,
ancestorCache: MutableMap<ClassMetadata, Set<MemberDesc>>, ancestorCache: MutableMap<ClassMetadata, Set<MemberDesc>>,
disjointSet: DisjointSet<MemberRef>, disjointSet: DisjointSet<MemberRef>,
clazz: ClassMetadata clazz: ClassMetadata
@ -168,24 +131,26 @@ class ClassPath(
val ancestorsBuilder = mutableSetOf<MemberDesc>() val ancestorsBuilder = mutableSetOf<MemberDesc>()
for (superClass in clazz.superClassAndInterfaces) { for (superClass in clazz.superClassAndInterfaces) {
val methods = populateInheritedMethodSets(ancestorCache, disjointSet, superClass) val members =
for (method in methods) { populateInheritedMemberSets(getMembers, getMemberAccess, ancestorCache, disjointSet, superClass)
val access = clazz.getMethodAccess(method)
for (member in members) {
val access = getMemberAccess(clazz, member)
if (access != null && access and Opcodes.ACC_STATIC != 0) { if (access != null && access and Opcodes.ACC_STATIC != 0) {
continue continue
} }
val partition1 = disjointSet.add(MemberRef(clazz.name, method)) val partition1 = disjointSet.add(MemberRef(clazz.name, member))
val partition2 = disjointSet.add(MemberRef(superClass.name, method)) val partition2 = disjointSet.add(MemberRef(superClass.name, member))
disjointSet.union(partition1, partition2) disjointSet.union(partition1, partition2)
ancestorsBuilder.add(method) ancestorsBuilder.add(member)
} }
} }
for (method in clazz.methods) { for (member in getMembers(clazz)) {
disjointSet.add(MemberRef(clazz.name, method)) disjointSet.add(MemberRef(clazz.name, member))
ancestorsBuilder.add(method) ancestorsBuilder.add(member)
} }
ancestorCache[clazz] = ancestorsBuilder ancestorCache[clazz] = ancestorsBuilder

Loading…
Cancel
Save