From 60012a1092e6cb0f4fe6fc9d9ffd9907826a8355 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 5 Jan 2022 06:42:27 -0500 Subject: [PATCH] Remove some unnecessary duplicated checks (#63341) * Remove unnecessary duplicate check in DeflateManagedStream ctor * Remove duplicate null check in JsonSerializer.Deserialize * Delete duplicate check in XmlSerializationWriterILGen.WriteQualifiedNameElement * Delete duplicate rule check in XmlTreeGen.AutoGenerated --- src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs | 4 ---- .../src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs | 2 -- .../src/System/Xml/Serialization/XmlSerializationWriterILGen.cs | 5 ----- .../src/System/Text/Json/Serialization/JsonSerializer.Read.String.cs | 5 ----- 4 files changed, 16 deletions(-) diff --git a/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs b/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs index a65a279..49fbf27 100644 --- a/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs +++ b/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs @@ -1700,14 +1700,10 @@ namespace System.Data if (fk.ExtendedProperties.Count > 0) return false; - if (fk.AcceptRejectRule != AcceptRejectRule.None) return false; if (fk.DeleteRule != Rule.Cascade) return false; - if (fk.DeleteRule != Rule.Cascade) - return false; - if (fk.RelatedColumnsReference.Length != 1) return false; diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs index c3a2765..ec71718 100644 --- a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs +++ b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs @@ -26,8 +26,6 @@ namespace System.IO.Compression throw new ArgumentNullException(nameof(stream)); if (!stream.CanRead) throw new ArgumentException(SR.NotSupported_UnreadableStream, nameof(stream)); - if (!stream.CanRead) - throw new ArgumentException(SR.NotSupported_UnreadableStream, nameof(stream)); Debug.Assert(method == ZipArchiveEntry.CompressionMethodValues.Deflate64); diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriterILGen.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriterILGen.cs index 006d951..1e22c1c 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriterILGen.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationWriterILGen.cs @@ -121,11 +121,6 @@ namespace System.Xml.Serialization argTypes.ToArray() )!; ilg.Call(XmlSerializationWriter_WriteXXX); - - if (hasDefault) - { - throw Globals.NotSupported("XmlQualifiedName DefaultValue not supported. Fail in WriteValue()"); - } } [RequiresUnreferencedCode("calls Load")] diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.String.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.String.cs index 4907af6..8606c9b 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.String.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.String.cs @@ -167,11 +167,6 @@ namespace System.Text.Json throw new ArgumentNullException(nameof(returnType)); } - if (returnType == null) - { - throw new ArgumentNullException(nameof(returnType)); - } - JsonTypeInfo jsonTypeInfo = GetTypeInfo(options, returnType); return ReadFromSpan(json, jsonTypeInfo)!; } -- 2.7.4