Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Make ModifyArg ignore the extra receiver parameter of a redirect… #114

Closed
wants to merge 1 commit into from
Closed

Fix: Make ModifyArg ignore the extra receiver parameter of a redirect… #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Arrays;
import java.util.List;

import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.MethodInsnNode;
Expand Down Expand Up @@ -110,6 +111,10 @@ protected void inject(Target target, InjectionNode node) {
protected void injectAtInvoke(Target target, InjectionNode node) {
MethodInsnNode methodNode = (MethodInsnNode)node.getCurrentTarget();
Type[] args = Type.getArgumentTypes(methodNode.desc);
if (node.hasDecoration(RedirectInjector.Meta.KEY) && node.isReplaced() && node.getOriginalTarget().getOpcode() != Opcodes.INVOKESTATIC) {
// A redirect handler method for a virtual target will have an extra arg at the start that we don't care about.
args = Arrays.copyOfRange(args, 1, args.length);
}
int argIndex = this.findArgIndex(target, args);
InsnList insns = new InsnList();
Extension extraLocals = target.extendLocals();
Expand Down