From a68f34f428d81edcebbf1876e2815945b7be0f0b Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Sun, 22 Dec 2013 01:18:47 +1000 Subject: [PATCH] Fixed MultipartGenerator using the wrong local variable offsets when generating a passThrough method with wide data type args --- codechicken/multipart/asm/ASMMixinCompiler.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index 6f50485..95b9819 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -247,8 +247,11 @@ object ASMMixinCompiler { val args = getArgumentTypes(mvdesc) val ret = getReturnType(mvdesc) - for(i <- 0 until args.length) - mv.visitVarInsn(args(i).getOpcode(ILOAD), i+1) + var localIndex = 1 + args.foreach{arg => + mv.visitVarInsn(arg.getOpcode(ILOAD), localIndex) + localIndex+=width(arg) + } mv.visitMethodInsn(opcode, owner, name, desc) mv.visitInsn(ret.getOpcode(IRETURN)) mv.visitMaxs(Math.max(width(args)+1, width(ret)), width(args)+1)