Skip to content

Fix lots of unnecessary XmlValueGetter delegate allocations #54344

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

Fix lots of unnecessary XmlValueGetter delegate allocations #54344

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libraries/System.Private.Xml/src/System/Xml/Core/XsdValidatingReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,12 +2015,12 @@ private void ProcessReaderEvent()

case XmlNodeType.Whitespace:
case XmlNodeType.SignificantWhitespace:
_validator.ValidateWhitespace(GetStringValue);
_validator.ValidateWhitespace(_valueGetter);
break;

case XmlNodeType.Text: // text inside a node
case XmlNodeType.CDATA: // <![CDATA[...]]>
_validator.ValidateText(GetStringValue);
_validator.ValidateText(_valueGetter);
break;

case XmlNodeType.EndElement:
Expand Down Expand Up @@ -2543,12 +2543,12 @@ private object InternalReadContentAsObject(bool unwrapTypedValue, out string ori

case XmlNodeType.Text:
case XmlNodeType.CDATA:
_validator.ValidateText(GetStringValue);
_validator.ValidateText(_valueGetter);
break;

case XmlNodeType.Whitespace:
case XmlNodeType.SignificantWhitespace:
_validator.ValidateWhitespace(GetStringValue);
_validator.ValidateWhitespace(_valueGetter);
break;

case XmlNodeType.Comment:
Expand Down Expand Up @@ -2611,12 +2611,12 @@ private void ReadAheadForMemberType()

case XmlNodeType.Text:
case XmlNodeType.CDATA:
_validator.ValidateText(GetStringValue);
_validator.ValidateText(_valueGetter);
break;

case XmlNodeType.Whitespace:
case XmlNodeType.SignificantWhitespace:
_validator.ValidateWhitespace(GetStringValue);
_validator.ValidateWhitespace(_valueGetter);
break;

case XmlNodeType.Comment:
Expand Down Expand Up @@ -2672,12 +2672,12 @@ private void GetIsDefault()

case XmlNodeType.Text:
case XmlNodeType.CDATA:
_validator.ValidateText(GetStringValue);
_validator.ValidateText(_valueGetter);
break;

case XmlNodeType.Whitespace:
case XmlNodeType.SignificantWhitespace:
_validator.ValidateWhitespace(GetStringValue);
_validator.ValidateWhitespace(_valueGetter);
break;

case XmlNodeType.Comment:
Expand Down