Some feedback for 8.0 after doing PR on dotnet#75366 for 7.0-rc2.

StephenMolloy · StephenMolloy · commit c51ed95e0772 · 2022-09-09T15:08:04.000-07:00
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryReader.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryReader.cs
@@ -1281,14 +1281,14 @@ private unsafe int ReadArray(short[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, short[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, short[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
@@ -1304,14 +1304,14 @@ private unsafe int ReadArray(int[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, int[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, int[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
@@ -1327,14 +1327,14 @@ private unsafe int ReadArray(long[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, long[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, long[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
@@ -1350,14 +1350,14 @@ private unsafe int ReadArray(float[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, float[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, float[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
@@ -1373,14 +1373,14 @@ private unsafe int ReadArray(double[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, double[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, double[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
@@ -1396,14 +1396,14 @@ private unsafe int ReadArray(decimal[] array, int offset, int count)
 
         public override int ReadArray(string localName, string namespaceUri, decimal[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
 
         public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, decimal[] array, int offset, int count)
         {
-            if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)
+            if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))
                 return ReadArray(array, offset, count);
             return base.ReadArray(localName, namespaceUri, array, offset, count);
         }
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryWriter.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryWriter.cs
@@ -758,7 +758,7 @@ public override unsafe void WriteFloatText(float f)
             {
                 int offset;
                 byte[] buffer = GetTextNodeBuffer(1 + sizeof(float), out offset);
-                buffer[offset + 0] = (byte)XmlBinaryNodeType.FloatText;
+                buffer[offset] = (byte)XmlBinaryNodeType.FloatText;
                 BinaryPrimitives.WriteSingleLittleEndian(buffer.AsSpan(offset + 1, sizeof(float)), f);
                 Advance(1 + sizeof(float));
             }
@@ -775,7 +775,7 @@ public override unsafe void WriteDoubleText(double d)
             {
                 int offset;
                 byte[] buffer = GetTextNodeBuffer(1 + sizeof(double), out offset);
-                buffer[offset + 0] = (byte)XmlBinaryNodeType.DoubleText;
+                buffer[offset] = (byte)XmlBinaryNodeType.DoubleText;
                 BinaryPrimitives.WriteDoubleLittleEndian(buffer.AsSpan(offset + 1, sizeof(double)), d);
                 Advance(1 + sizeof(double));
             }

Original file line number	Diff line number	Diff line change
`@@ -1281,14 +1281,14 @@ private unsafe int ReadArray(short[] array, int offset, int count)`
`1281`	`1281`
`1282`	`1282`	`public override int ReadArray(string localName, string namespaceUri, short[] array, int offset, int count)`
`1283`	`1283`	`{`
`1284`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1284`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement))`
`1285`	`1285`	`return ReadArray(array, offset, count);`
`1286`	`1286`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1287`	`1287`	`}`
`1288`	`1288`
`1289`	`1289`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, short[] array, int offset, int count)`
`1290`	`1290`	`{`
`1291`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1291`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int16TextWithEndElement))`
`1292`	`1292`	`return ReadArray(array, offset, count);`
`1293`	`1293`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1294`	`1294`	`}`
`@@ -1304,14 +1304,14 @@ private unsafe int ReadArray(int[] array, int offset, int count)`
`1304`	`1304`
`1305`	`1305`	`public override int ReadArray(string localName, string namespaceUri, int[] array, int offset, int count)`
`1306`	`1306`	`{`
`1307`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1307`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement))`
`1308`	`1308`	`return ReadArray(array, offset, count);`
`1309`	`1309`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`	`1312`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, int[] array, int offset, int count)`
`1313`	`1313`	`{`
`1314`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1314`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int32TextWithEndElement))`
`1315`	`1315`	`return ReadArray(array, offset, count);`
`1316`	`1316`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1317`	`1317`	`}`
`@@ -1327,14 +1327,14 @@ private unsafe int ReadArray(long[] array, int offset, int count)`
`1327`	`1327`
`1328`	`1328`	`public override int ReadArray(string localName, string namespaceUri, long[] array, int offset, int count)`
`1329`	`1329`	`{`
`1330`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1330`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement))`
`1331`	`1331`	`return ReadArray(array, offset, count);`
`1332`	`1332`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`	`1335`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, long[] array, int offset, int count)`
`1336`	`1336`	`{`
`1337`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement) && BitConverter.IsLittleEndian)`
	`1337`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.Int64TextWithEndElement))`
`1338`	`1338`	`return ReadArray(array, offset, count);`
`1339`	`1339`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1340`	`1340`	`}`
`@@ -1350,14 +1350,14 @@ private unsafe int ReadArray(float[] array, int offset, int count)`
`1350`	`1350`
`1351`	`1351`	`public override int ReadArray(string localName, string namespaceUri, float[] array, int offset, int count)`
`1352`	`1352`	`{`
`1353`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1353`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))`
`1354`	`1354`	`return ReadArray(array, offset, count);`
`1355`	`1355`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1356`	`1356`	`}`
`1357`	`1357`
`1358`	`1358`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, float[] array, int offset, int count)`
`1359`	`1359`	`{`
`1360`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1360`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))`
`1361`	`1361`	`return ReadArray(array, offset, count);`
`1362`	`1362`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1363`	`1363`	`}`
`@@ -1373,14 +1373,14 @@ private unsafe int ReadArray(double[] array, int offset, int count)`
`1373`	`1373`
`1374`	`1374`	`public override int ReadArray(string localName, string namespaceUri, double[] array, int offset, int count)`
`1375`	`1375`	`{`
`1376`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1376`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))`
`1377`	`1377`	`return ReadArray(array, offset, count);`
`1378`	`1378`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1379`	`1379`	`}`
`1380`	`1380`
`1381`	`1381`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, double[] array, int offset, int count)`
`1382`	`1382`	`{`
`1383`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1383`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))`
`1384`	`1384`	`return ReadArray(array, offset, count);`
`1385`	`1385`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1386`	`1386`	`}`
`@@ -1396,14 +1396,14 @@ private unsafe int ReadArray(decimal[] array, int offset, int count)`
`1396`	`1396`
`1397`	`1397`	`public override int ReadArray(string localName, string namespaceUri, decimal[] array, int offset, int count)`
`1398`	`1398`	`{`
`1399`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1399`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))`
`1400`	`1400`	`return ReadArray(array, offset, count);`
`1401`	`1401`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1402`	`1402`	`}`
`1403`	`1403`
`1404`	`1404`	`public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, decimal[] array, int offset, int count)`
`1405`	`1405`	`{`
`1406`		`- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)`
	`1406`	`+ if (BitConverter.IsLittleEndian && IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))`
`1407`	`1407`	`return ReadArray(array, offset, count);`
`1408`	`1408`	`return base.ReadArray(localName, namespaceUri, array, offset, count);`
`1409`	`1409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ public override unsafe void WriteFloatText(float f)`
`758`	`758`	`{`
`759`	`759`	`int offset;`
`760`	`760`	`byte[] buffer = GetTextNodeBuffer(1 + sizeof(float), out offset);`
`761`		`- buffer[offset + 0] = (byte)XmlBinaryNodeType.FloatText;`
	`761`	`+ buffer[offset] = (byte)XmlBinaryNodeType.FloatText;`
`762`	`762`	`BinaryPrimitives.WriteSingleLittleEndian(buffer.AsSpan(offset + 1, sizeof(float)), f);`
`763`	`763`	`Advance(1 + sizeof(float));`
`764`	`764`	`}`
`@@ -775,7 +775,7 @@ public override unsafe void WriteDoubleText(double d)`
`775`	`775`	`{`
`776`	`776`	`int offset;`
`777`	`777`	`byte[] buffer = GetTextNodeBuffer(1 + sizeof(double), out offset);`
`778`		`- buffer[offset + 0] = (byte)XmlBinaryNodeType.DoubleText;`
	`778`	`+ buffer[offset] = (byte)XmlBinaryNodeType.DoubleText;`
`779`	`779`	`BinaryPrimitives.WriteDoubleLittleEndian(buffer.AsSpan(offset + 1, sizeof(double)), d);`
`780`	`780`	`Advance(1 + sizeof(double));`
`781`	`781`	`}`