Fix a stack overflow in IndexEntryResolver

QuiltMC · Feb 25, 2025 · 115ab98 · 115ab98
1 parent 61af4f0
commit 115ab98
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/IndexEntryResolver.java b/enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/IndexEntryResolver.java
@@ -13,6 +13,7 @@
 import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
 import org.quiltmc.enigma.api.translation.representation.entry.Entry;
 import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;
+import org.tinylog.Logger;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -125,11 +126,16 @@ private Set<Entry<ClassEntry>> resolveEntryInAncestry(Entry<ClassEntry> entry, R
 		if (entry instanceof MethodEntry methodEntry) {
 			MethodEntry bridgeMethod = this.bridgeMethodIndex.getBridgeFromSpecialized(methodEntry);
 			if (bridgeMethod != null && ownerClass.equals(bridgeMethod.getParent())) {
-				Set<Entry<ClassEntry>> resolvedBridge = this.resolveEntryInAncestry(bridgeMethod, strategy, skipStatic);
-				if (!resolvedBridge.isEmpty()) {
-					return resolvedBridge;
+				if (bridgeMethod != methodEntry) {
+					Set<Entry<ClassEntry>> resolvedBridge = this.resolveEntryInAncestry(bridgeMethod, strategy, skipStatic);
+					if (!resolvedBridge.isEmpty()) {
+						return resolvedBridge;
+					} else {
+						return Collections.singleton(bridgeMethod);
+					}
 				} else {
-					return Collections.singleton(bridgeMethod);
+					// TODO: Find out cause?
+					Logger.warn("Bridge method for {} is itself!", methodEntry);
 				}
 			}
 		}