Skip to content

Split CheckNotDisposed to allow inlining #63863

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
stephentoub merged 2 commits into from
Jan 18, 2022
Merged

Split CheckNotDisposed to allow inlining #63863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e05f79b
Split CheckNotDisposed to allow inlining
MichalStrehovsky Jan 17, 2022
e700e3a
Review feedback
MichalStrehovsky Jan 17, 2022
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
6 changes: 6 additions & 0 deletions src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,12 @@ public static void ThrowInvalidOperationException_ExpectedChar(JsonTokenType tok
{
throw GetInvalidOperationException("char", tokenType);
}

[DoesNotReturn]
public static void ThrowObjectDisposedException_Utf8JsonWriter()
{
throw new ObjectDisposedException(nameof(Utf8JsonWriter));
}
}

internal enum ExceptionResource
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private void CheckNotDisposed()
// The conditions are ordered with stream first as that would be the most common mode
if (_output == null)
{
throw new ObjectDisposedException(nameof(Utf8JsonWriter));
ThrowHelper.ThrowObjectDisposedException_Utf8JsonWriter();
}
}
}
Expand Down