mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-21 03:22:17 +00:00
Fix stack calc error when inlining CallbackInfo ctor
This commit is contained in:
1 parent
c04eb1bdd7
commit
b134940a19
2 files changed
+14
-6
No files matched your search
@@ -505,9 +505,11 @@ public class CallbackInjector extends Injector {
|
||||
callback.add(new TypeInsnNode(Opcodes.NEW, callback.target.callbackInfoClass), true, !store);
|
||||
callback.add(new InsnNode(Opcodes.DUP), true, true);
|
||||
|
||||
this.invokeCallbackInfoCtor(callback);
|
||||
this.invokeCallbackInfoCtor(callback, store);
|
||||
if (store) {
|
||||
callback.add(new VarInsnNode(Opcodes.ASTORE, callback.marshallVar));
|
||||
} else if (callback.target.returnType != Type.VOID_TYPE) {
|
||||
callback.invoke++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -541,13 +543,14 @@ public class CallbackInjector extends Injector {
|
||||
|
||||
/**
|
||||
* @param callback callback handle
|
||||
* @param store true if storing in a local, false if this is happening at an invoke
|
||||
*/
|
||||
protected void invokeCallbackInfoCtor(final Callback callback) {
|
||||
callback.add(new LdcInsnNode(callback.target.method.name), true, false);
|
||||
callback.add(new InsnNode(this.cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0), true, false);
|
||||
protected void invokeCallbackInfoCtor(final Callback callback, boolean store) {
|
||||
callback.add(new LdcInsnNode(callback.target.method.name), true, !store);
|
||||
callback.add(new InsnNode(this.cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0), true, !store);
|
||||
|
||||
if (callback.isAtReturn) {
|
||||
callback.add(new VarInsnNode(callback.target.returnType.getOpcode(Opcodes.ILOAD), callback.marshallVar));
|
||||
callback.add(new VarInsnNode(callback.target.returnType.getOpcode(Opcodes.ILOAD), callback.marshallVar), true, !store);
|
||||
callback.add(new MethodInsnNode(Opcodes.INVOKESPECIAL,
|
||||
callback.target.callbackInfoClass, Injector.CTOR, CallbackInfo.getConstructorDescriptor(callback.target.returnType), false));
|
||||
} else {
|
||||
|
||||
+6
-1
@@ -53,7 +53,12 @@ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule
|
||||
*/
|
||||
@Override
|
||||
public void postApply(String transformedName, ClassNode targetClass, SortedSet<MixinInfo> mixins) {
|
||||
targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES)));
|
||||
try {
|
||||
targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES)));
|
||||
} catch (RuntimeException ex) {
|
||||
System.err.printf("%s\n", ex.getMessage());
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user