From 67d8bfed47f61a7b0a1b1fc4612d18a0aadf67be Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 14 Jan 2016 21:02:07 -0500 Subject: [PATCH] I don't know why this is failing --- src/main/java/net/runelite/deob/ClassFile.java | 6 ++++++ .../deob/attributes/code/instructions/InvokeVirtual.java | 8 +++++++- .../runelite/deob/deobfuscators/rename/MapStaticTest.java | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/runelite/deob/ClassFile.java b/src/main/java/net/runelite/deob/ClassFile.java index 5f6c8be6b2..cdfa6fb1ca 100644 --- a/src/main/java/net/runelite/deob/ClassFile.java +++ b/src/main/java/net/runelite/deob/ClassFile.java @@ -66,6 +66,12 @@ public class ClassFile methods = new Methods(this); attributes = new Attributes(this); } + + @Override + public String toString() + { + return "ClassFile{" + "name=" + name + '}'; + } public void write(DataOutputStream out) throws IOException { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java index 5a34baaad4..12a406432a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java @@ -173,7 +173,13 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction assert myMethods.size() == otherMethods.size(); for (int i = 0; i < myMethods.size(); ++i) - mapping.map(myMethods.get(i), otherMethods.get(i)); + { + net.runelite.deob.Method m1 = myMethods.get(i), m2 = otherMethods.get(i); + + assert m1.getMethods().getClassFile().getName().equals(m2.getMethods().getClassFile().getName()); + + mapping.map(m1, m2); + } } @Override diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java index 8ac7fab043..83b441b296 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java @@ -63,8 +63,8 @@ public class MapStaticTest ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar")); ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar")); - Method m1 = group1.findClass("class40").findMethod("method851"); - Method m2 = group2.findClass("class40").findMethod("method803"); + Method m1 = group1.findClass("class55").findMethod("method1187"); + Method m2 = group2.findClass("class55").findMethod("method1140"); ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2); }