From 4674dfb5bafabf058e889a5b6f36a48d851cf7ad Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 30 May 2020 18:32:58 +0100 Subject: [PATCH] Remove FieldInitializer class We don't need to track the class version and maxStack value: the Library::remap will already have access to them (and always needs to, as it has to fiddle with {Class,Field,Method}Nodes to actually move the field). Signed-off-by: Graham --- .../dev/openrs2/asm/classpath/ExtendedRemapper.kt | 3 ++- .../dev/openrs2/asm/classpath/FieldInitializer.kt | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 asm/src/main/java/dev/openrs2/asm/classpath/FieldInitializer.kt diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt b/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt index b9e17ce0..3e917977 100644 --- a/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt +++ b/asm/src/main/java/dev/openrs2/asm/classpath/ExtendedRemapper.kt @@ -1,9 +1,10 @@ package dev.openrs2.asm.classpath import org.objectweb.asm.commons.Remapper +import org.objectweb.asm.tree.AbstractInsnNode abstract class ExtendedRemapper : Remapper() { - open fun getFieldInitializer(owner: String, name: String, descriptor: String): FieldInitializer? { + open fun getFieldInitializer(owner: String, name: String, descriptor: String): List? { return null } diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/FieldInitializer.kt b/asm/src/main/java/dev/openrs2/asm/classpath/FieldInitializer.kt deleted file mode 100644 index 3b64da40..00000000 --- a/asm/src/main/java/dev/openrs2/asm/classpath/FieldInitializer.kt +++ /dev/null @@ -1,14 +0,0 @@ -package dev.openrs2.asm.classpath - -import dev.openrs2.asm.MemberRef -import org.objectweb.asm.Opcodes -import org.objectweb.asm.tree.AbstractInsnNode -import org.objectweb.asm.tree.FieldInsnNode - -class FieldInitializer(val instructions: List, val version: Int, val maxStack: Int) { - val dependencies = instructions.asSequence() - .filterIsInstance() - .filter { it.opcode == Opcodes.GETSTATIC } - .map(::MemberRef) - .toSet() -}