Skip to content

Switch Markup property to XmlNode?[]? to reflect it can contain null elements - #41488

Merged
jozkee merged 2 commits into
dotnet:masterfrom
jozkee:nullability_markup
Aug 28, 2020
Merged

Switch Markup property to XmlNode?[]? to reflect it can contain null elements#41488
jozkee merged 2 commits into
dotnet:masterfrom
jozkee:nullability_markup

Conversation

@jozkee

@jozkeejozkee commented Aug 28, 2020

Copy link
Copy Markdown
Member

Switches Markup property from XmlNode[]? to XmlNode?[]? in XmlSchemaAppInfo and XmlSchemaDocumentation.

@jozkeejozkee added this to the 5.0.0 milestone Aug 28, 2020
@jozkeejozkee self-assigned this Aug 28, 2020
@ghost

ghost commented Aug 28, 2020

Copy link
Copy Markdown

Tagging subscribers to this area: @buyaa-n, @krwq
See info in area-owners.md if you want to be subscribed.

jeffhandley
jeffhandley approved these changes Aug 28, 2020
View reviewed changes

@jeffhandleyjeffhandley left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but please get another review. 😃

safern
safern reviewed Aug 28, 2020
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/SchemaObjectWriter.cs
for (int ia = 0; ia < a.Length; ia++)
{
XmlNode ai = (XmlNode)a[ia];
XmlNode ai = (XmlNode)a[ia]!;

@safernsafernAug 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do we know this can't be null?

@jozkeejozkeeAug 28, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not 100% sure but if ai happens to be null that would cause a NRE in line 552. So product code already assumes that ai can't be null.

Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XsdBuilder.cs
}

internal override void ProcessMarkup(XmlNode[] markup)
internal override void ProcessMarkup(XmlNode?[] markup)

@safernsafernAug 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can't markup be null here?

@jozkeejozkeeAug 28, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

markup is always initialized in the only call site.

runtime/src/libraries/System.Private.Xml/src/System/Xml/Schema/Parser.cs

Lines 246 to 252 in 454d66d

XmlNode?[]markup=newXmlNode[list.Count];
for(inti=0;i<list.Count;i++)
{
markup[i]=list[i];
}
_builder!.ProcessMarkup(markup);

Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XdrBuilder.cs
}

internal override void ProcessMarkup(XmlNode[] markup)
internal override void ProcessMarkup(XmlNode?[] markup)

@safernsafernAug 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can't markup be null?

@jozkeejozkeeAug 28, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same answer as previous comment #41488 (comment).

eerhardt
eerhardt approved these changes Aug 28, 2020
View reviewed changes

@eerhardteerhardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@jozkee
jozkee merged commit 7408f1b into dotnet:masterAug 28, 2020
@carlossanlopcarlossanlop mentioned this pull request Aug 28, 2020
Merged
14 tasks
@jozkee
jozkee deleted the nullability_markup branch August 28, 2020 06:58
@jaredparjaredpar mentioned this pull request Aug 28, 2020
Closed
@ghostghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@krwqkrwqkrwq approved these changes
@jeffhandleyjeffhandleyjeffhandley approved these changes
@eerhardteerhardteerhardt approved these changes
@safernsafernsafern approved these changes
@carlossanlopcarlossanlopAwaiting requested review from carlossanlop
@pgovindpgovindAwaiting requested review from pgovind

Assignees

@jozkeejozkee

Labels

area-System.Xml

Projects

None yet

Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@jozkee@krwq@jeffhandley@eerhardt@safern