GabrielTofvesson/Beethoven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant code

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-01-28 07:08:10 +01:00
parent e4064fa5e0
commit b1089086e2
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/dev/w1zzrd/asm/Combine.java
View File

@ -12,20 +12,14 @@ import jdk.internal.org.objectweb.asm.Type;
import jdk.internal.org.objectweb.asm.tree.*; import jdk.internal.org.objectweb.asm.tree.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_MAXS; import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
public class Combine { public class Combine {
private static final String VAR_NAME_CHARS = "$_qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM";
private static final String VAR_NAME_CHARS1 = "$_qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890";
private final ArrayList<DynamicSourceUnit> graftSources = new ArrayList<>(); private final ArrayList<DynamicSourceUnit> graftSources = new ArrayList<>();
private final ClassNode target; private final ClassNode target;
@ -302,18 +296,6 @@ public class Combine {
node.name = source.getMethodTargetName(node); node.name = source.getMethodTargetName(node);
} }
private static LabelNode findOrMakeEndLabel(List<AbstractInsnNode> nodes) {
AbstractInsnNode last = nodes.get(nodes.size() - 1);
if (last instanceof LabelNode)
return (LabelNode) last;
LabelNode label = new LabelNode();
nodes.add(label);
return label;
}
protected static LabelNode findOrMakeEndLabel(InsnList nodes) { protected static LabelNode findOrMakeEndLabel(InsnList nodes) {
AbstractInsnNode last = nodes.getLast(); AbstractInsnNode last = nodes.getLast();
@ -413,29 +395,6 @@ public class Combine {
} }
} }
private static List<AbstractInsnNode> decomposeToList(InsnList insns) {
try {
// This should save us some overhead
Field elementData = ArrayList.class.getDeclaredField("elementData");
elementData.setAccessible(true);
Field size = ArrayList.class.getDeclaredField("size");
size.setAccessible(true);
// Make arraylist and get array of instructions
ArrayList<AbstractInsnNode> decomposed = new ArrayList<>();
AbstractInsnNode[] nodes = insns.toArray();
// Copy instructions to arraylist
elementData.set(decomposed, nodes);
size.set(decomposed, nodes.length);
return decomposed;
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException(e); // Probably Java 9+
}
}
private static void adjustArgument(MethodNode node, LocalVariableNode varNode, boolean backward, boolean insert) { private static void adjustArgument(MethodNode node, LocalVariableNode varNode, boolean backward, boolean insert) {
if (backward) { if (backward) {
// Finds first label or creates it // Finds first label or creates it
@ -817,15 +776,6 @@ public class Combine {
return Arrays.asList(node.instructions.toArray()); return Arrays.asList(node.instructions.toArray());
} }
protected static InsnList coalesceInstructions(List<AbstractInsnNode> nodes) {
InsnList insns = new InsnList();
for(AbstractInsnNode node : nodes)
insns.add(node);
return insns;
}
protected static List<LocalVariableNode> getVarsOver(List<LocalVariableNode> varNodes, int minIndex) { protected static List<LocalVariableNode> getVarsOver(List<LocalVariableNode> varNodes, int minIndex) {
return varNodes.stream().filter(it -> it.index >= minIndex).collect(Collectors.toList()); return varNodes.stream().filter(it -> it.index >= minIndex).collect(Collectors.toList());
} }