From 09c387ae6c270b79dc793e6b7be4dcebd220c2a4 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Wed, 31 Jul 2013 11:37:21 +1000 Subject: [PATCH] Run acquired bytes through name transformers before defining. --- codechicken/multipart/asm/ASMMixinCompiler.scala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index e60b8b5..2d78abb 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -61,7 +61,9 @@ object ASMMixinCompiler { val cl = getClass.getClassLoader.asInstanceOf[LaunchClassLoader] val m_defineClass = classOf[ClassLoader].getDeclaredMethod("defineClass", classOf[Array[Byte]], Integer.TYPE, Integer.TYPE) + val m_runTransformers = classOf[LaunchClassLoader].getDeclaredMethod("runTransformers", classOf[String], classOf[String], classOf[Array[Byte]]) m_defineClass.setAccessible(true) + m_runTransformers.setAccessible(true) private val traitByteMap = MMap[String, Array[Byte]]() private val mixinMap = MMap[String, MixinInfo]() @@ -73,6 +75,12 @@ object ASMMixinCompiler m_defineClass.invoke(cl, bytes, 0:Integer, bytes.length:Integer).asInstanceOf[Class[_]] } + def getBytes(name:String) = + { + val jName = name.replace('/', '.') + m_runTransformers.invoke(cl, jName, jName, cl.getClassBytes(jName)).asInstanceOf[Array[Byte]] + } + def internalDefine(name:String, bytes:Array[Byte]) { traitByteMap.put(name.replace('.', '/'), bytes) @@ -80,7 +88,7 @@ object ASMMixinCompiler DebugPrinter.dump(name, bytes) } - def classNode(name:String) = traitByteMap.getOrElseUpdate(name.replace('.', '/'), cl.getClassBytes(name.replace('/', '.'))) match { + def classNode(name:String) = traitByteMap.getOrElseUpdate(name.replace('.', '/'), getBytes(name)) match { case null => null case v => createClassNode(v, ClassReader.EXPAND_FRAMES) }