Skip to content

Allow @Invoker usage for interfaces #413

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

Open
CertainLach wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow @Invoker usage for interfaces #413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd31f06
Allow @Invoker usage for interfaces
CertainLach Jun 17, 2020
af2d241
Use InterfaceMethodRef instead of MethodRef
CertainLach Jun 17, 2020
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
15 changes: 12 additions & 3 deletions src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.InsnNode;
import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
Expand All @@ -38,9 +39,14 @@
public class AccessorGeneratorMethodProxy extends AccessorGenerator {

/**
* The target field, identified by the accessor info
* The target method, identified by the accessor info
*/
protected final MethodNode targetMethod;

/**
* Where original method was located
*/
protected final ClassNode methodLocation;

/**
* Accessor method argument types (raw, from method)
Expand All @@ -55,6 +61,7 @@ public class AccessorGeneratorMethodProxy extends AccessorGenerator {
public AccessorGeneratorMethodProxy(AccessorInfo info) {
super(info, Bytecode.isStatic(info.getTargetMethod()));
this.targetMethod = info.getTargetMethod();
this.methodLocation = info.getClassNode();
this.argTypes = info.getArgTypes();
this.returnType = info.getReturnType();
this.checkModifiers();
Expand All @@ -63,6 +70,7 @@ public AccessorGeneratorMethodProxy(AccessorInfo info) {
protected AccessorGeneratorMethodProxy(AccessorInfo info, boolean isStatic) {
super(info, isStatic);
this.targetMethod = info.getTargetMethod();
this.methodLocation = info.getClassNode();
this.argTypes = info.getArgTypes();
this.returnType = info.getReturnType();
}
Expand All @@ -76,8 +84,9 @@ public MethodNode generate() {
}
Bytecode.loadArgs(this.argTypes, method.instructions, this.targetIsStatic ? 0 : 1);
boolean isPrivate = Bytecode.hasFlag(this.targetMethod, Opcodes.ACC_PRIVATE);
int opcode = this.targetIsStatic ? Opcodes.INVOKESTATIC : (isPrivate ? Opcodes.INVOKESPECIAL : Opcodes.INVOKEVIRTUAL);
method.instructions.add(new MethodInsnNode(opcode, this.info.getClassNode().name, this.targetMethod.name, this.targetMethod.desc, false));
boolean isInterface = Bytecode.hasFlag(this.methodLocation, Opcodes.ACC_INTERFACE);
int opcode = this.targetIsStatic ? Opcodes.INVOKESTATIC : (isPrivate ? Opcodes.INVOKESPECIAL : (isInterface ? Opcodes.INVOKEINTERFACE : Opcodes.INVOKEVIRTUAL));
method.instructions.add(new MethodInsnNode(opcode, this.info.getClassNode().name, this.targetMethod.name, this.targetMethod.desc, isInterface));
method.instructions.add(new InsnNode(this.returnType.getOpcode(Opcodes.IRETURN)));
return method;
}
Expand Down