Skip to content

Swap Dictionary<K, V> with HashSet<XamlMember>, avoid double lookup #10750

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Swap Dictionary<K, V> with HashSet<XamlMember>, avoid double lookup #10750

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
8 changes: 3 additions & 5 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlMarkupExtensionWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,12 @@ private void CheckMemberForUniqueness(Node objectNode, XamlMember property)
{
if (objectNode.Members is null)
{
objectNode.Members = new XamlPropertySet();
objectNode.Members = new HashSet<XamlMember>() { property };
}
else if (objectNode.Members.Contains(property))
else if (!objectNode.Members.Add(property))
{
throw new InvalidOperationException(SR.Format(SR.XamlMarkupExtensionWriterDuplicateMember, property.Name));
}

objectNode.Members.Add(property);
}
}

Expand Down Expand Up @@ -188,7 +186,7 @@ public XamlMember XamlProperty
set;
}

public XamlPropertySet Members
public HashSet<XamlMember> Members
{
get;
set;
Expand Down
31 changes: 5 additions & 26 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlXmlWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,27 +495,23 @@ private void CheckMemberForUniqueness(XamlMember property)
{
// Find the top most object frame.
Frame objectFrame = namespaceScopes.Peek();
if (objectFrame.AllocatingNodeType != XamlNodeType.StartObject &&
objectFrame.AllocatingNodeType != XamlNodeType.GetObject)
if (objectFrame.AllocatingNodeType is not XamlNodeType.StartObject and not XamlNodeType.GetObject)
{
Frame temp = namespaceScopes.Pop();
objectFrame = namespaceScopes.Peek();
namespaceScopes.Push(temp);
}

Debug.Assert(objectFrame.AllocatingNodeType == XamlNodeType.StartObject ||
objectFrame.AllocatingNodeType == XamlNodeType.GetObject);
Debug.Assert(objectFrame.AllocatingNodeType is XamlNodeType.StartObject or XamlNodeType.GetObject);

if (objectFrame.Members is null)
{
objectFrame.Members = new XamlPropertySet();
objectFrame.Members = new HashSet<XamlMember>() { property };
}
else if (objectFrame.Members.Contains(property))
else if (!objectFrame.Members.Add(property))
{
throw new XamlXmlWriterException(SR.Format(SR.XamlXmlWriterDuplicateMember, property.Name));
}

objectFrame.Members.Add(property);
}
}

Expand Down Expand Up @@ -690,7 +686,7 @@ public XamlMember Member
set;
}

public XamlPropertySet Members
public HashSet<XamlMember> Members
{
get;
set;
Expand Down Expand Up @@ -2181,21 +2177,4 @@ public void Reset()
}
}
}

// need to implement our own Set class to alleviate ties to System.Core.dll
// HashSet<T> lives in System.Core.dll
internal class XamlPropertySet
{
private Dictionary<XamlMember, bool> dictionary = new Dictionary<XamlMember, bool>();

public bool Contains(XamlMember member)
{
return dictionary.ContainsKey(member);
}

public void Add(XamlMember member)
{
dictionary.Add(member, true);
}
}
}