From 75f383a1956eb19fc838ea647a7e7b24552324cf Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Fri, 10 May 2019 22:21:11 +0200 Subject: Don't remap specialized methods to their bridge partner in bytecode --- .../cuchaz/enigma/translation/mapping/IndexEntryResolver.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/cuchaz/enigma/translation') diff --git a/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java b/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java index 6c8ed76..78231dd 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java @@ -86,7 +86,7 @@ public class IndexEntryResolver implements EntryResolver { ClassEntry ownerClass = entry.getParent(); if (entry instanceof MethodEntry) { - MethodEntry bridgeMethod = bridgeMethodIndex.getBridgeFromAccessed((MethodEntry) entry); + MethodEntry bridgeMethod = bridgeMethodIndex.getBridgeFromSpecialized((MethodEntry) entry); if (bridgeMethod != null && ownerClass.equals(bridgeMethod.getParent())) { Set> resolvedBridge = resolveChildEntry(bridgeMethod, strategy); if (!resolvedBridge.isEmpty()) { @@ -183,10 +183,10 @@ public class IndexEntryResolver implements EntryResolver { } // look at bridge methods! - MethodEntry bridgedMethod = bridgeMethodIndex.getBridgeFromAccessed(methodEntry); + MethodEntry bridgedMethod = bridgeMethodIndex.getBridgeFromSpecialized(methodEntry); while (bridgedMethod != null) { methodEntries.addAll(resolveEquivalentMethods(bridgedMethod)); - bridgedMethod = bridgeMethodIndex.getBridgeFromAccessed(bridgedMethod); + bridgedMethod = bridgeMethodIndex.getBridgeFromSpecialized(bridgedMethod); } // look at interface methods too @@ -209,10 +209,10 @@ public class IndexEntryResolver implements EntryResolver { } // look at bridge methods! - MethodEntry bridgedMethod = bridgeMethodIndex.getBridgeFromAccessed(methodEntry); + MethodEntry bridgedMethod = bridgeMethodIndex.getBridgeFromSpecialized(methodEntry); while (bridgedMethod != null) { methodEntries.addAll(resolveEquivalentMethods(bridgedMethod)); - bridgedMethod = bridgeMethodIndex.getBridgeFromAccessed(bridgedMethod); + bridgedMethod = bridgeMethodIndex.getBridgeFromSpecialized(bridgedMethod); } // recurse -- cgit v1.2.3