From 3a29f61d7cd2d935608cb5c4fa132ce8300154c2 Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 7 Mar 2020 10:49:22 +0000 Subject: [PATCH] Remove existing FrameNode manipulation support This code is no longer used. Remove it to avoid bit rot. Signed-off-by: Graham --- .../main/java/dev/openrs2/asm/ClassNodeRemapper.kt | 13 +------------ .../main/java/dev/openrs2/asm/MethodNodeUtils.kt | 10 +--------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt b/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt index 896c01e7..095106c1 100644 --- a/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt +++ b/asm/src/main/java/dev/openrs2/asm/ClassNodeRemapper.kt @@ -45,20 +45,9 @@ fun ClassNode.remap(remapper: Remapper) { } } -private fun Remapper.mapFrameType(type: Any?): Any? { - return if (type is String) { - mapType(type) - } else { - type - } -} - private fun AbstractInsnNode.remap(remapper: Remapper) { when (this) { - is FrameNode -> { - local = local?.map(remapper::mapFrameType) - stack = stack?.map(remapper::mapFrameType) - } + is FrameNode -> throw UnsupportedOperationException("SKIP_FRAMES and COMPUTE_FRAMES must be used") is FieldInsnNode -> { val originalOwner = owner owner = remapper.mapType(originalOwner) diff --git a/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt b/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt index 6fad19e1..bb6556b1 100644 --- a/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt +++ b/asm/src/main/java/dev/openrs2/asm/MethodNodeUtils.kt @@ -96,15 +96,7 @@ fun MethodNode.removeArgument(argIndex: Int) { when (insn) { is VarInsnNode -> insn.`var` = remap(insn.`var`, argType, localIndex) is IincInsnNode -> insn.`var` = remap(insn.`var`, argType, localIndex) - is FrameNode -> { - if (insn.type != Opcodes.F_NEW) { - throw UnsupportedOperationException("Only F_NEW frames are supported") - } - - for (i in 0 until argType.size) { - insn.local.removeAt(localIndex) - } - } + is FrameNode -> throw UnsupportedOperationException("SKIP_FRAMES and COMPUTE_FRAMES must be used") } } }