From b1cd46c8c4960eae026bcd6dd9bafb59cafa4d52 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 17 Mar 2021 21:21:09 +0000 Subject: [PATCH] Remove now-redundant overload for match --- .../mixin/injection/points/BeforeInvoke.java | 3 +- .../injection/selectors/ElementNode.java | 30 ++++++++++++++----- .../injection/selectors/ITargetSelector.java | 9 ------ .../injection/selectors/InvalidSelector.java | 12 -------- .../injection/selectors/MemberMatcher.java | 20 ------------- .../dynamic/DynamicSelectorDesc.java | 19 ------------ .../mixin/injection/struct/MemberInfo.java | 16 ---------- 7 files changed, 24 insertions(+), 85 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java index e47ae8cc..d531fec0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java @@ -38,6 +38,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.IInjectionPointContext; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectionPoint.AtCode; +import org.spongepowered.asm.mixin.injection.selectors.ElementNode; import org.spongepowered.asm.mixin.injection.selectors.ITargetSelector; import org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorByName; import org.spongepowered.asm.mixin.injection.selectors.ITargetSelector.Configure; @@ -196,7 +197,7 @@ public class BeforeInvoke extends InjectionPoint { MemberInfo nodeInfo = new MemberInfo(insn); this.log("{}->{} is considering {}", this.context, this.className, nodeInfo); - if (target.match(insn).isExactMatch()) { + if (target.match(ElementNode.of(insn)).isExactMatch()) { this.log("{}->{} > found a matching insn, checking preconditions...", this.context, this.className); if (++matchCount > target.getMaxMatchCount()) { break; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ElementNode.java b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ElementNode.java index 52ac2036..1d4de64b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ElementNode.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ElementNode.java @@ -39,7 +39,6 @@ import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.InvokeDynamicInsnNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; -import org.spongepowered.asm.util.Handles; import com.google.common.base.Strings; @@ -188,7 +187,7 @@ public abstract class ElementNode { } @Override - public boolean isMethod() { + public boolean isInsn() { return true; } @@ -263,8 +262,13 @@ public abstract class ElementNode { } @Override - public boolean isMethod() { - return this.implMethod == null || !Handles.isField(this.implMethod); + public boolean isInvokeDynamic() { + return true; + } + + @Override + public boolean isInsn() { + return true; } @Override @@ -336,7 +340,7 @@ public abstract class ElementNode { } @Override - public boolean isField() { + public boolean isInsn() { return true; } @@ -431,26 +435,36 @@ public abstract class ElementNode { } /** - * Get whether this element is a method + * Get whether this element is a method, implies getMethod() will return + * a value */ public boolean isMethod() { return false; } /** - * get whether this element is a field + * get whether this element is a field, implies getField() will return + * a value */ public boolean isField() { return false; } /** - * get whether this element is an instruction + * get whether this element is an instruction, implies getInsn() will return + * a value */ public boolean isInsn() { return false; } + /** + * get whether this element is an INVOKEDYNAMIC insn + */ + public boolean isInvokeDynamic() { + return false; + } + /** * Get the {@link MethodNode} if this member is a method, otherwise returns * null diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ITargetSelector.java b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ITargetSelector.java index 00e62ead..20212a7e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ITargetSelector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/ITargetSelector.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.injection.selectors; -import org.objectweb.asm.tree.AbstractInsnNode; import org.spongepowered.asm.mixin.injection.Desc; import org.spongepowered.asm.mixin.injection.selectors.dynamic.DynamicSelectorDesc; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; @@ -235,13 +234,5 @@ public interface ITargetSelector { * @return true if this selector can match the supplied field */ public abstract MatchResult match(ElementNode node); - - /** - * Test whether this selector matches the supplied instruction node - * - * @param insn instruction node to test - * @return true if this selector can match the supplied instruction - */ - public abstract MatchResult match(AbstractInsnNode insn); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/InvalidSelector.java b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/InvalidSelector.java index 33238a66..6d7fb435 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/InvalidSelector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/InvalidSelector.java @@ -24,8 +24,6 @@ */ package org.spongepowered.asm.mixin.injection.selectors; -import org.objectweb.asm.tree.AbstractInsnNode; - /** * Since the contract of {@link TargetSelector#parse} prohibits returing * null, instances of this selector are returned when supplied arguments @@ -138,14 +136,4 @@ public class InvalidSelector implements ITargetSelector { return MatchResult.NONE; } - /* (non-Javadoc) - * @see org.spongepowered.asm.mixin.injection.selectors.ITargetSelector - * #match(org.objectweb.asm.tree.AbstractInsnNode) - */ - @Override - public MatchResult match(AbstractInsnNode insn) { - this.validate(); - return MatchResult.NONE; - } - } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/MemberMatcher.java b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/MemberMatcher.java index 25f331de..2ab8dd4f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/MemberMatcher.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/MemberMatcher.java @@ -28,10 +28,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.MethodInsnNode; - /** * A {@link ITargetSelector Target Selector} which matches an element of * candidate members using a regular expression. This selector is not remappable @@ -233,22 +229,6 @@ public final class MemberMatcher implements ITargetSelector { return node == null ? MatchResult.NONE : this.matches(node.getOwner(), node.getName(), node.getDesc()); } - /* (non-Javadoc) - * @see org.spongepowered.asm.mixin.injection.selectors.ITargetSelector - * #matches(org.objectweb.asm.tree.AbstractInsnNode) - */ - @Override - public MatchResult match(AbstractInsnNode insn) { - if (insn instanceof MethodInsnNode) { - MethodInsnNode method = (MethodInsnNode)insn; - return this.matches(method.owner, method.name, method.desc); - } else if (insn instanceof FieldInsnNode) { - FieldInsnNode field = (FieldInsnNode)insn; - return this.matches(field.owner, field.name, field.desc); - } - return MatchResult.NONE; - } - private MatchResult matches(String... args) { MatchResult result = MatchResult.NONE; // boolean exactOnly = true; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/dynamic/DynamicSelectorDesc.java b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/dynamic/DynamicSelectorDesc.java index e3f48c9b..a1768f3b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/selectors/dynamic/DynamicSelectorDesc.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/selectors/dynamic/DynamicSelectorDesc.java @@ -27,9 +27,6 @@ package org.spongepowered.asm.mixin.injection.selectors.dynamic; import java.util.List; import org.objectweb.asm.Type; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.MethodInsnNode; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Desc; import org.spongepowered.asm.mixin.injection.Inject; @@ -506,22 +503,6 @@ public class DynamicSelectorDesc implements ITargetSelectorDynamic, ITargetSelec } } - /* (non-Javadoc) - * @see org.spongepowered.asm.mixin.injection.selectors.ITargetSelector - * #matches(org.objectweb.asm.tree.AbstractInsnNode) - */ - @Override - public MatchResult match(AbstractInsnNode insn) { - if (insn instanceof MethodInsnNode) { - MethodInsnNode method = (MethodInsnNode)insn; - return this.matches(method.owner, method.name, method.desc, this.methodDesc); - } else if (insn instanceof FieldInsnNode) { - FieldInsnNode field = (FieldInsnNode)insn; - return this.matches(field.owner, field.name, field.desc, this.returnType.getInternalName()); - } - return MatchResult.NONE; - } - private MatchResult matches(String owner, String name, String desc, String compareWithDesc) { if (!compareWithDesc.equals(desc)) { return MatchResult.NONE; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index ee629a16..0bd081b5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -698,22 +698,6 @@ public final class MemberInfo implements ITargetSelectorRemappable, ITargetSelec return node == null ? MatchResult.NONE : this.matches(node.getOwner(), node.getName(), node.getDesc()); } - /* (non-Javadoc) - * @see org.spongepowered.asm.mixin.injection.selectors.ITargetSelector - * #matches(org.objectweb.asm.tree.AbstractInsnNode) - */ - @Override - public MatchResult match(AbstractInsnNode insn) { - if (insn instanceof MethodInsnNode) { - MethodInsnNode method = (MethodInsnNode)insn; - return this.matches(method.owner, method.name, method.desc); - } else if (insn instanceof FieldInsnNode) { - FieldInsnNode field = (FieldInsnNode)insn; - return this.matches(field.owner, field.name, field.desc); - } - return MatchResult.NONE; - } - /* (non-Javadoc) * @see org.spongepowered.asm.mixin.injection.selectors.ITargetSelector * #matches(java.lang.String, java.lang.String, java.lang.String)