Merge pull request #433 from ToddGrun/dev/toddgrun/RemoveHasFlagUsage

Remove HasFlag usage as it's particularly slow on netfx
microsoft · Nov 30, 2023 · d1f52ba · d1f52ba
2 parents 92c50df + cbfdaa1
commit d1f52ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Microsoft.VisualStudio.Composition/Configuration/AttributedPartDiscoveryV1.cs b/src/Microsoft.VisualStudio.Composition/Configuration/AttributedPartDiscoveryV1.cs
@@ -397,7 +397,7 @@ private ImportDefinitionBinding CreateImport(ParameterInfo parameter)
                             {
                                 if (result.ContainsKey(property.Name))
                                 {
-                                    string memberName = member.MemberType.HasFlag(MemberTypes.TypeInfo) || member.MemberType.HasFlag(MemberTypes.NestedType)
+                                    string memberName = (member.MemberType & (MemberTypes.TypeInfo | MemberTypes.NestedType)) != 0
                                         ? ((TypeInfo)member).FullName!
                                         : $"{member.DeclaringType?.FullName}.{member.Name}";
 

diff --git a/src/Microsoft.VisualStudio.Composition/Configuration/CachedComposition.cs b/src/Microsoft.VisualStudio.Composition/Configuration/CachedComposition.cs
@@ -281,14 +281,14 @@ private RuntimeComposition.RuntimeImport ReadRuntimeImport()
                 {
                     var flags = (RuntimeImportFlags)this.reader!.ReadByte();
                     var cardinality =
-                        flags.HasFlag(RuntimeImportFlags.CardinalityOneOrZero) ? ImportCardinality.OneOrZero :
-                        flags.HasFlag(RuntimeImportFlags.CardinalityExactlyOne) ? ImportCardinality.ExactlyOne :
+                        (flags & RuntimeImportFlags.CardinalityOneOrZero) == RuntimeImportFlags.CardinalityOneOrZero ? ImportCardinality.OneOrZero :
+                        (flags & RuntimeImportFlags.CardinalityExactlyOne) == RuntimeImportFlags.CardinalityExactlyOne ? ImportCardinality.ExactlyOne :
                         ImportCardinality.ZeroOrMore;
-                    bool isExportFactory = flags.HasFlag(RuntimeImportFlags.IsExportFactory);
+                    bool isExportFactory = (flags & RuntimeImportFlags.IsExportFactory) == RuntimeImportFlags.IsExportFactory;
 
                     MemberRef? importingMember = default(MemberRef);
                     ParameterRef? importingParameter = default(ParameterRef);
-                    if (flags.HasFlag(RuntimeImportFlags.IsParameter))
+                    if ((flags & RuntimeImportFlags.IsParameter) == RuntimeImportFlags.IsParameter)
                     {
                         importingParameter = this.ReadParameterRef();
                     }
@@ -313,7 +313,7 @@ private RuntimeComposition.RuntimeImport ReadRuntimeImport()
                             importingSiteTypeWithoutCollectionRef,
                             cardinality,
                             satisfyingExports!,
-                            flags.HasFlag(RuntimeImportFlags.IsNonSharedInstanceRequired),
+                            (flags & RuntimeImportFlags.IsNonSharedInstanceRequired) == RuntimeImportFlags.IsNonSharedInstanceRequired,
                             isExportFactory,
                             metadata,
                             exportFactorySharingBoundaries!)
@@ -323,7 +323,7 @@ private RuntimeComposition.RuntimeImport ReadRuntimeImport()
                             importingSiteTypeWithoutCollectionRef,
                             cardinality,
                             satisfyingExports!,
-                            flags.HasFlag(RuntimeImportFlags.IsNonSharedInstanceRequired),
+                            (flags & RuntimeImportFlags.IsNonSharedInstanceRequired) == RuntimeImportFlags.IsNonSharedInstanceRequired,
                             isExportFactory,
                             metadata,
                             exportFactorySharingBoundaries!);