From 99fd3296cfd0d8f3d0c16a13efed6d6e8deecd9e Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Mon, 10 Feb 2025 16:18:43 -0800 Subject: [PATCH 1/2] Fix suspicious code fragments Contributes to #112344 --- .../ILVerification/ILImporter.StackValue.cs | 3 --- .../ComInterop/DynamicVariantExtensions.cs | 2 +- .../Microsoft/VisualBasic/VBCodeGenerator.cs | 3 --- .../System/Xml/BinaryXml/XmlBinaryReader.cs | 27 +++++++++---------- .../System/Reflection/Emit/TypeBuilderImpl.cs | 2 +- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/coreclr/tools/ILVerification/ILImporter.StackValue.cs b/src/coreclr/tools/ILVerification/ILImporter.StackValue.cs index 18c9736aeb3f51..e5618020feb70c 100644 --- a/src/coreclr/tools/ILVerification/ILImporter.StackValue.cs +++ b/src/coreclr/tools/ILVerification/ILImporter.StackValue.cs @@ -161,9 +161,6 @@ static public StackValue CreateFromType(TypeDesc type) public override bool Equals(object obj) { - if (Object.ReferenceEquals(this, obj)) - return true; - if (!(obj is StackValue)) return false; diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/DynamicVariantExtensions.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/DynamicVariantExtensions.cs index 5b8f45469ddcd4..3d7202c9b78c67 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/DynamicVariantExtensions.cs +++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/DynamicVariantExtensions.cs @@ -66,7 +66,7 @@ public static void SetAsIConvertible(this ref ComVariant variant, IConvertible v case TypeCode.Int32: variant = ComVariant.Create(value.ToInt32(ci)); break; case TypeCode.UInt32: variant = ComVariant.Create(value.ToUInt32(ci)); break; case TypeCode.Int64: variant = ComVariant.Create(value.ToInt64(ci)); break; - case TypeCode.UInt64: variant = ComVariant.Create(value.ToInt64(ci)); break; + case TypeCode.UInt64: variant = ComVariant.Create(value.ToUInt64(ci)); break; case TypeCode.Single: variant = ComVariant.Create(value.ToSingle(ci)); break; case TypeCode.Double: variant = ComVariant.Create(value.ToDouble(ci)); break; case TypeCode.Decimal: variant = ComVariant.Create(value.ToDecimal(ci)); break; diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs index 58f468d7c8fa97..321f03cfb55f56 100644 --- a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs +++ b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs @@ -577,9 +577,6 @@ protected override void OutputMemberScopeModifier(MemberAttributes attributes) case MemberAttributes.Override: Output.Write("Overrides "); break; - case MemberAttributes.Private: - Output.Write("Private "); - break; default: switch (attributes & MemberAttributes.AccessMask) { diff --git a/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/XmlBinaryReader.cs b/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/XmlBinaryReader.cs index de768e66b53781..f803aa7419cf2c 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/XmlBinaryReader.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/XmlBinaryReader.cs @@ -3023,22 +3023,19 @@ private void ImplReadData(BinXmlToken tokenType) private void ImplReadElement() { - if (3 != _docState || 9 != _docState) + switch (_docState) { - switch (_docState) - { - case 0: - _docState = 9; - break; - case 1: - case 2: - _docState = 3; - break; - case -1: - throw CreateUnexpectedTokenException(_token); - default: - break; - } + case 0: + _docState = 9; + break; + case 1: + case 2: + _docState = 3; + break; + case -1: + throw CreateUnexpectedTokenException(_token); + default: + break; } _elemDepth++; if (_elemDepth == _elementStack.Length) diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs index 2ca4e426be999e..ad913966549a07 100644 --- a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs +++ b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs @@ -734,7 +734,7 @@ private static bool MatchesTheFilter(MethodBuilderImpl method, BindingFlags meth if (argType.IsArray != paramType.IsArray || argType.IsByRef != paramType.IsByRef || - argType.IsPointer != argType.IsPointer) + argType.IsPointer != paramType.IsPointer) { return false; } From 7f137e25ec7d97399fcb41944ad8d53b76f688d2 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Tue, 11 Feb 2025 17:04:42 -0800 Subject: [PATCH 2/2] Update src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs --- .../src/System/Reflection/Emit/TypeBuilderImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs index ad913966549a07..2ca4e426be999e 100644 --- a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs +++ b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs @@ -734,7 +734,7 @@ private static bool MatchesTheFilter(MethodBuilderImpl method, BindingFlags meth if (argType.IsArray != paramType.IsArray || argType.IsByRef != paramType.IsByRef || - argType.IsPointer != paramType.IsPointer) + argType.IsPointer != argType.IsPointer) { return false; }