Skip to content

Dispose enumerators during type traversal #578

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

Open
SychicBoy wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −17
Open

Dispose enumerators during type traversal #578

Show file tree
Hide file tree
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
24 changes: 15 additions & 9 deletions src/DotNet/AllTypesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,28 @@ readonly struct AllTypesHelper {
public static IEnumerable<TypeDef> Types(IEnumerable<TypeDef> types) {
var visited = new Dictionary<TypeDef, bool>();
var stack = new Stack<IEnumerator<TypeDef>>();
if (types is not null)
stack.Push(types.GetEnumerator());
while (stack.Count > 0) {
var enumerator = stack.Pop();
while (enumerator.MoveNext()) {
try {
if (types is not null)
stack.Push(types.GetEnumerator());
while (stack.Count > 0) {
var enumerator = stack.Peek();
if (!enumerator.MoveNext()) {
stack.Pop().Dispose();
continue;
}
var type = enumerator.Current;
if (visited.ContainsKey(type))
continue;
visited[type] = true;
yield return type;
if (type.NestedTypes.Count > 0) {
stack.Push(enumerator);
enumerator = type.NestedTypes.GetEnumerator();
}
if (type.NestedTypes.Count > 0)
stack.Push(type.NestedTypes.GetEnumerator());
}
}
finally {
while (stack.Count > 0)
stack.Pop().Dispose();
}
}
}
}
22 changes: 14 additions & 8 deletions src/DotNet/Writer/Metadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,21 +1825,27 @@ void AddExportedTypes() {
var sortedTypes = new List<ExportedType>(exportedTypes.Count);
var visited = new Dictionary<ExportedType, bool>();
var stack = new Stack<IEnumerator<ExportedType>>();
stack.Push(exportedTypes.GetEnumerator());
while (stack.Count > 0) {
var enumerator = stack.Pop();
while (enumerator.MoveNext()) {
try {
stack.Push(exportedTypes.GetEnumerator());
while (stack.Count > 0) {
var enumerator = stack.Peek();
if (!enumerator.MoveNext()) {
stack.Pop().Dispose();
continue;
}
var type = enumerator.Current;
if (visited.ContainsKey(type))
continue;
visited[type] = true;
sortedTypes.Add(type);
if (nestedTypeDict.TryGetValue(type, out var nested) && nested.Count > 0) {
stack.Push(enumerator);
enumerator = nested.GetEnumerator();
}
if (nestedTypeDict.TryGetValue(type, out var nested) && nested.Count > 0)
stack.Push(nested.GetEnumerator());
}
}
finally {
while (stack.Count > 0)
stack.Pop().Dispose();
}

int count = sortedTypes.Count;
for (int i = 0; i < count; i++)
Expand Down