From 1ba2172e8a788a54d0c59b05ed9dbd1945b1399e Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Thu, 19 Jan 2023 17:12:21 +0000 Subject: [PATCH] Fix wrong asm types being used for TypeInsnNodes --- dependencies.gradle | 4 ++-- .../codechicken/multipart/asm/ASMMixinCompiler.scala | 4 ++-- .../scala/codechicken/multipart/asm/StackAnalyser.scala | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7a21ea2..908a5a2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,6 @@ // Add your dependencies here dependencies { - compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev") - compile("com.github.GTNewHorizons:NotEnoughItems:2.3.5-GTNH:dev") + compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev") + compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev") } diff --git a/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala b/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala index c0f9eca..047525e 100644 --- a/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/src/main/scala/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -446,7 +446,7 @@ object ASMMixinCompiler } def staticTransform(mnode: MethodNode, base: MethodNode) { - val stack = new StackAnalyser(getType(cnode.name), base) + val stack = new StackAnalyser(getType(Type.getObjectType(cnode.name).getDescriptor), base) val insnList = mnode.instructions var insn = insnList.getFirst @@ -478,7 +478,7 @@ object ASMMixinCompiler //cast to parent class and call val mType = Type.getMethodType(minsn.desc) val instanceEntry = stack.peek(width(mType.getArgumentTypes)) - insnList.insert(instanceEntry.insn, new TypeInsnNode(CHECKCAST, cnode.superName)) + insnList.insert(instanceEntry.insn, new TypeInsnNode(CHECKCAST, Type.getObjectType(cnode.superName).getDescriptor)) minsn.owner = cnode.superName } } diff --git a/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala b/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala index 444e778..a34ed68 100644 --- a/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala +++ b/src/main/scala/codechicken/multipart/asm/StackAnalyser.scala @@ -283,10 +283,10 @@ class StackAnalyser(val owner:Type, val m:MethodNode) } case tinsn:TypeInsnNode => ainsn.getOpcode match { - case NEW => push(New(getType(tinsn.desc))) - case NEWARRAY => push(NewArray(pop(), getType(tinsn.desc))) - case ANEWARRAY => push(NewArray(pop(), getType("["+tinsn.desc))) - case CHECKCAST => push(Cast(pop(), getType(tinsn.desc))) + case NEW => push(New(getObjectType(tinsn.desc))) + case NEWARRAY => push(NewArray(pop(), getObjectType(tinsn.desc))) + case ANEWARRAY => push(NewArray(pop(), getObjectType("["+tinsn.desc))) + case CHECKCAST => push(Cast(pop(), getObjectType(tinsn.desc))) case INSTANCEOF => push(UnaryOp(INSTANCEOF, pop())) } case mainsn:MultiANewArrayInsnNode =>