R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix superclass capability types being ignored sometimes

Browse Source
This commit is contained in:
embeddedt 2026-02-27 20:53:40 -05:00
parent 696b344ef5
commit df06010846
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/org/embeddedt/modernfix/forge/capability/analysis/CapabilityAnalyzer.java
View File

@ -154,31 +154,39 @@ public class CapabilityAnalyzer {
// If any source is unknown, try the guard region fallback before giving up // If any source is unknown, try the guard region fallback before giving up
if (!unknownSources.isEmpty()) { if (!unknownSources.isEmpty()) {
boolean allResolved = false;
// Check if the return itself is in a guard region // Check if the return itself is in a guard region
for (GuardRegion guard : guardRegions) { for (GuardRegion guard : guardRegions) {
if (returnIndex > guard.guardIndex && returnIndex < guard.targetIndex) { if (returnIndex > guard.guardIndex && returnIndex < guard.targetIndex) {
return new ReturnClassification.Known(Set.of(guard.capabilityRef)); caps.add(guard.capabilityRef);
} allResolved = true;
}
// Also check if each unknown source instruction is inside a guard region.
// This handles ternary patterns where both branches merge into a single
// ARETURN after the guard, but the unknown value was produced inside it.
boolean allResolved = true;
for (AbstractInsnNode unknownSource : unknownSources) {
int sourceIndex = instructions.indexOf(unknownSource);
boolean resolved = false;
for (GuardRegion guard : guardRegions) {
if (sourceIndex > guard.guardIndex && sourceIndex < guard.targetIndex) {
caps.add(guard.capabilityRef);
resolved = true;
break;
}
}
if (!resolved) {
allResolved = false;
break; break;
} }
} }
// Also check if each unknown source instruction is inside a guard region.
// This handles ternary patterns where both branches merge into a single
// ARETURN after the guard, but the unknown value was produced inside it.
if (!allResolved) {
allResolved = true;
for (AbstractInsnNode unknownSource : unknownSources) {
int sourceIndex = instructions.indexOf(unknownSource);
boolean resolved = false;
for (GuardRegion guard : guardRegions) {
if (sourceIndex > guard.guardIndex && sourceIndex < guard.targetIndex) {
caps.add(guard.capabilityRef);
resolved = true;
break;
}
}
if (!resolved) {
allResolved = false;
break;
}
}
}
if (!allResolved) { if (!allResolved) {
return new ReturnClassification.Unknown(unknownReason); return new ReturnClassification.Unknown(unknownReason);
} }