Skip to content

fix: StackOverflow due to indirect circular class dependencies #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
Merged

fix: StackOverflow due to indirect circular class dependencies #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/net/minecraftforge/fart/internal/EnhancedRemapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public Optional<MClass> getClass(String cls) {
ret = resolved.get(cls);
if (ret == null) {
ret = computeClass(cls);
resolved.put(cls, ret);
}
}
}
Expand All @@ -132,7 +131,7 @@ private Optional<MClass> computeClass(String cls) {
IMappingFile.IClass mcls = this.map.getClass(cls);
if (!icls.isPresent() && mcls == null)
return Optional.empty();
return Optional.of(new MClass(icls.orElse(null), mcls));
return Optional.of(new MClass(cls, icls.orElse(null), mcls));
}

public class MClass {
Expand All @@ -145,14 +144,18 @@ public class MClass {
private final Map<String, Optional<MMethod>> methods = new ConcurrentHashMap<>();
private Collection<Optional<MMethod>> methodsView = Collections.unmodifiableCollection(methods.values());

MClass(IClassInfo icls, IMappingFile.IClass mcls) {
MClass(String cls, IClassInfo icls, IMappingFile.IClass mcls) {
if (icls == null && mcls == null)
throw new IllegalArgumentException("Can't pass in both nulls..");

this.icls = icls;
this.mcls = mcls;
this.mappedName = mcls == null ? EnhancedRemapper.this.getMap().remapClass(icls.getName()) : mcls.getMapped();

// Put ourselves into the resolved map earlier so we could avoid StackOverflowError in some cases
// See https://github.com/Sinytra/Connector/issues/1592#issuecomment-3211922070
resolved.put(cls, Optional.of(this));

if (icls != null) {
List<MClass> parents = new ArrayList<>();
EnhancedRemapper.this.getClass(icls.getSuper()).ifPresent(parents::add);
Expand Down