From a99012eabc9178efad58c7e6d4c0664219280b9b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 17 Jan 2016 01:07:41 +0000 Subject: [PATCH] Resolve methods references recursively as well as fields, fixes #93 --- .../tools/obfuscation/AnnotatedMixin.java | 29 +--------- .../tools/obfuscation/AnnotatedMixins.java | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index e9bcbdc9..9eb4e722 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -627,7 +627,7 @@ class AnnotatedMixin { } if (targetMember.isField()) { - ObfuscationData obfFieldData = this.getObfFieldRecursive(targetMember); + ObfuscationData obfFieldData = this.mixins.getObfFieldRecursive(targetMember); if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); return false; @@ -645,33 +645,6 @@ class AnnotatedMixin { return true; } - private ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.mixins.getObfClass(targetMember.owner); - ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); - try { - while (obfFieldData.isEmpty()) { - TypeHandle targetType = this.mixins.getTypeHandle(targetMember.owner); - if (targetType == null) { - return obfFieldData; - } - TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfFieldData; - } - targetMember = targetMember.move(superClass.getName()); - obfFieldData = this.mixins.getObfField(targetMember.toSrg()); - if (!obfFieldData.isEmpty()) { - for (ObfuscationType type : obfFieldData) { - obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); - } - } - } - } catch (Exception ex) { - // ??? - } - return obfFieldData; - } - /** * Add a field mapping to the local table */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 907560d2..af54467b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -300,6 +300,33 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return new PrintWriter(outSrg.openWriter()); } + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.getObfClass(targetMember.owner); + ObfuscationData obfMethodData = this.getObfMethod(targetMember.asMethodData()); + try { + while (obfMethodData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfMethodData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfMethodData; + } + targetMember = targetMember.move(superClass.getName()); + obfMethodData = this.getObfMethod(targetMember.asMethodData()); + if (!obfMethodData.isEmpty()) { + for (ObfuscationType type : obfMethodData) { + obfMethodData.add(type, MemberInfo.fromSrgMethod(obfMethodData.get(type)).move(targetNames.get(type)).asMethodData()); + } + } + } + } catch (Exception ex) { + // ??? + } + return obfMethodData; + } + public ObfuscationData getObfMethod(MemberInfo method) { ObfuscationData data = new ObfuscationData(); @@ -329,6 +356,33 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.getObfClass(targetMember.owner); + ObfuscationData obfFieldData = this.getObfField(targetMember.toSrg()); + try { + while (obfFieldData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfFieldData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfFieldData; + } + targetMember = targetMember.move(superClass.getName()); + obfFieldData = this.getObfField(targetMember.toSrg()); + if (!obfFieldData.isEmpty()) { + for (ObfuscationType type : obfFieldData) { + obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); + } + } + } + } catch (Exception ex) { + // ??? + } + return obfFieldData; + } + /** * Get an obfuscation mapping for a field */