Skip to content

Remove delegate allocations from FindAmbientValues #4733

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 17, 2021
Merged

Remove delegate allocations from FindAmbientValues #4733

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
37 changes: 16 additions & 21 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,22 +205,6 @@ internal IEnumerable<AmbientPropertyValue> ServiceProvider_GetAllAmbientValues(I
return valueList;
}

private static void CheckAmbient(XamlMember xamlMember)
{
if (!xamlMember.IsAmbient)
{
throw new ArgumentException(SR.Get(SRID.NotAmbientProperty, xamlMember.DeclaringType.Name, xamlMember.Name), nameof(xamlMember));
}
}

private static void CheckAmbient(XamlType xamlType)
{
if (!xamlType.IsAmbient)
{
throw new ArgumentException(SR.Get(SRID.NotAmbientType, xamlType.Name), nameof(xamlType));
}
}

internal XamlObjectWriterSettings ServiceProvider_GetSettings()
{
if (_settings == null)
Expand Down Expand Up @@ -326,8 +310,15 @@ private List<AmbientPropertyValue> FindAmbientValues(IEnumerable<XamlType> ceili
XamlMember[] properties,
bool stopAfterFirst)
{
ArrayHelper.ForAll<XamlMember>(properties, CheckAmbient);
List<XamlType> ceilingTypes = ArrayHelper.ToList<XamlType>(ceilingTypesEnumerable);
foreach (XamlMember xamlMember in properties)
{
if (!xamlMember.IsAmbient)
{
throw new ArgumentException(SR.Get(SRID.NotAmbientProperty, xamlMember.DeclaringType.Name, xamlMember.Name), nameof(properties));
}
}

List<XamlType> ceilingTypes = ceilingTypesEnumerable != null ? new List<XamlType>(ceilingTypesEnumerable) : null;

List<AmbientPropertyValue> retList = new List<AmbientPropertyValue>();

Expand Down Expand Up @@ -436,13 +427,18 @@ private List<AmbientPropertyValue> FindAmbientValues(IEnumerable<XamlType> ceili

private List<object> FindAmbientValues(XamlType[] types, bool stopAfterFirst)
{
ArrayHelper.ForAll<XamlType>(types, CheckAmbient);
foreach (XamlType xamlType in types)
{
if (!xamlType.IsAmbient)
{
throw new ArgumentException(SR.Get(SRID.NotAmbientType, xamlType.Name), nameof(types));
}
}

List<object> retList = new List<object>();

// Start the search for ambient properties with the parent frame.
ObjectWriterFrame frame = _stack.PreviousFrame;
ObjectWriterFrame lowerFrame = _stack.CurrentFrame;

while (frame.Depth >= 1)
{
Expand All @@ -463,7 +459,6 @@ private List<object> FindAmbientValues(XamlType[] types, bool stopAfterFirst)
}
}

lowerFrame = frame;
frame = (ObjectWriterFrame)frame.Previous;
Debug.Assert(frame != null);
}
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/XamlContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,12 @@ internal XamlType GetXamlType(XamlTypeName typeName, bool returnUnknownTypesOnFa
XamlType[] typeArgs = null;
if (typeName.HasTypeArgs)
{
typeArgs = ArrayHelper.ConvertArrayType<XamlTypeName, XamlType>(
typeName.TypeArguments, GetXamlTypeOrUnknown);
List<XamlTypeName> typeNames = typeName.TypeArgumentsList;
typeArgs = new XamlType[typeNames.Count];
for (int i = 0; i < typeArgs.Length; i++)
{
typeArgs[i] = GetXamlTypeOrUnknown(typeNames[i]);
}
}
xamlType = new XamlType(typeName.Namespace, typeName.Name, typeArgs, SchemaContext);
}
Expand Down
39 changes: 0 additions & 39 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/ArrayHelper.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/XamlTypeName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public IList<XamlTypeName> TypeArguments
}
}

internal List<XamlTypeName> TypeArgumentsList => _typeArguments;

public override string ToString()
{
return ToString(null);
Expand Down