mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-19 06:09:13 +00:00
Fixes and improvements for local capture, avoid cryptic error on bad LVT
This commit is contained in:
1 parent
4e1c5b272b
commit
10040e9f3d
4 files changed
+41
-7
No files matched your search
@@ -145,9 +145,12 @@ public class CallbackInjector extends Injector {
|
||||
this.locals = locals;
|
||||
this.localTypes = locals != null ? new Type[locals.length] : null;
|
||||
this.frameSize = ASMHelper.getFirstNonArgLocalIndex(target.arguments, !CallbackInjector.this.isStatic());
|
||||
List<String> argNames = null;
|
||||
List<String> argNames = null;
|
||||
|
||||
ASMHelper.printNode(this.node);
|
||||
|
||||
if (locals != null) {
|
||||
int baseArgIndex = CallbackInjector.this.isStatic() ? 0 : 1;
|
||||
argNames = new ArrayList<String>();
|
||||
for (int l = 0; l <= locals.length; l++) {
|
||||
if (l == this.frameSize) {
|
||||
@@ -155,7 +158,7 @@ public class CallbackInjector extends Injector {
|
||||
}
|
||||
if (l < locals.length && locals[l] != null) {
|
||||
this.localTypes[l] = Type.getType(locals[l].desc);
|
||||
if (l > 0) {
|
||||
if (l >= baseArgIndex) {
|
||||
argNames.add(locals[l].name);
|
||||
}
|
||||
}
|
||||
@@ -323,6 +326,17 @@ public class CallbackInjector extends Injector {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Check whether user is just using the wrong CallbackInfo type
|
||||
String returnableSig = this.methodNode.desc.replace(
|
||||
"Lorg/spongepowered/asm/mixin/injection/callback/CallbackInfo;",
|
||||
"Lorg/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable;");
|
||||
|
||||
if (callback.getDescriptor().equals(returnableSig)) {
|
||||
// Switching out CallbackInfo for CallbackInfoReturnable
|
||||
// worked, so notify the user that they done derped
|
||||
throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: CallbackInfoReturnable is required!");
|
||||
}
|
||||
|
||||
throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: expected " + callback.getDescriptor()
|
||||
+ " but found " + this.methodNode.desc);
|
||||
}
|
||||
|
||||
@@ -360,7 +360,7 @@ public class ASMHelper {
|
||||
* @param node Node to print
|
||||
*/
|
||||
public static void printNode(AbstractInsnNode node) {
|
||||
System.err.printf("%s ", node.getClass().getSimpleName());
|
||||
System.err.printf("%-14s ", node.getClass().getSimpleName().replace("Node", ""));
|
||||
if (node instanceof LabelNode) {
|
||||
System.err.printf("[%s]", ((LabelNode)node).getLabel());
|
||||
} else if (node instanceof JumpInsnNode) {
|
||||
|
||||
@@ -190,6 +190,13 @@ public class Locals {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Null out any "unknown" locals
|
||||
for (int l = 0; l < frame.length; l++) {
|
||||
if (frame[l] != null && frame[l].desc == null) {
|
||||
frame[l] = null;
|
||||
}
|
||||
}
|
||||
|
||||
return frame;
|
||||
}
|
||||
@@ -317,8 +324,12 @@ public class Locals {
|
||||
}
|
||||
|
||||
if (label == null) {
|
||||
label = new LabelNode();
|
||||
labels[i] = label;
|
||||
AbstractInsnNode existingLabel = method.instructions.get(i);
|
||||
if (existingLabel instanceof LabelNode) {
|
||||
label = (LabelNode) existingLabel;
|
||||
} else {
|
||||
labels[i] = label = new LabelNode();
|
||||
}
|
||||
}
|
||||
|
||||
if (local == null && locals[j] != null) {
|
||||
|
||||
@@ -118,6 +118,10 @@ public class SignaturePrinter {
|
||||
this.returnType = returnType;
|
||||
this.argTypes = argTypes;
|
||||
this.argNames = argNames;
|
||||
if (this.argTypes.length > this.argNames.length) {
|
||||
throw new IllegalArgumentException(String.format("Types array length must not exceed names array length! (names=%d, types=%d)",
|
||||
this.argNames.length, this.argTypes.length));
|
||||
}
|
||||
}
|
||||
|
||||
public String getReturnType() {
|
||||
@@ -172,8 +176,13 @@ public class SignaturePrinter {
|
||||
sb.append(' ');
|
||||
}
|
||||
}
|
||||
String name = typesOnly ? null : Strings.isNullOrEmpty(this.argNames[var]) ? "unnamed" + var : this.argNames[var];
|
||||
this.appendType(sb, this.argTypes[var], name);
|
||||
try {
|
||||
String name = typesOnly ? null : Strings.isNullOrEmpty(this.argNames[var]) ? "unnamed" + var : this.argNames[var];
|
||||
this.appendType(sb, this.argTypes[var], name);
|
||||
} catch (Exception ex) {
|
||||
System.err.printf("\n\n>>> argTypes=%d, argNames=%d\n\n", this.argTypes.length, this.argNames.length);
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
return sb.append(")");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user