Use Tuple Key with Type in HasAttributeCached

Author: mythz

src/ServiceStack.Text/PlatformExtensions.cs

@@ -133,10 +133,11 @@ public static MethodInfo GetInstanceMethod(this Type type, string methodName) =>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool HasAttribute<T>(this MethodInfo mi) => mi.AllAttributes().Any(x => x.GetType() == typeof(T));
 
-        private static Dictionary<MemberInfo, bool> hasAttributeCache = new Dictionary<MemberInfo, bool>();
+        private static Dictionary<Tuple<MemberInfo,Type>, bool> hasAttributeCache = new Dictionary<Tuple<MemberInfo,Type>, bool>();
         public static bool HasAttributeCached<T>(this MemberInfo memberInfo)
         {
-            if (hasAttributeCache.TryGetValue(memberInfo, out var hasAttr))
+            var key = new Tuple<MemberInfo,Type>(memberInfo, typeof(T));
+            if (hasAttributeCache.TryGetValue(key , out var hasAttr))
                 return hasAttr;
 
             hasAttr = memberInfo is Type t 
@@ -149,12 +150,12 @@ public static bool HasAttributeCached<T>(this MemberInfo memberInfo)
                 ? mi.AllAttributes().Any(x => x.GetType() == typeof(T))
                 : throw new NotSupportedException(memberInfo.GetType().Name);
 
-            Dictionary<MemberInfo, bool> snapshot, newCache;
+            Dictionary<Tuple<MemberInfo,Type>, bool> snapshot, newCache;
             do
             {
                 snapshot = hasAttributeCache;
-                newCache = new Dictionary<MemberInfo, bool>(hasAttributeCache) {
-                    [memberInfo] = hasAttr
+                newCache = new Dictionary<Tuple<MemberInfo,Type>, bool>(hasAttributeCache) {
+                    [key ] = hasAttr
                 };
 
             } while (!ReferenceEquals(

tests/ServiceStack.Text.Tests/ReflectionExtensionTests.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using NUnit.Framework;
 using ServiceStack;
+using ServiceStack.DataAnnotations;
 
 namespace ServiceStack.Text.Tests
 {
@@ -130,6 +131,21 @@ public void Does_GetCollectionType()
             Assert.That(new[] { "" }.Select(x => new TestModel()).GetType().GetCollectionType(), Is.EqualTo(typeof(TestModel)));
         }
 
+        [EnumAsChar]
+        public enum CharEnum : int
+        {
+            Value1 = 'A', 
+            Value2 = 'B', 
+            Value3 = 'C', 
+            Value4 = 'D'
+        }
+
+        [Test]
+        public void Can_use_HasAttributeCached()
+        {
+            Assert.That(typeof(CharEnum).HasAttributeCached<EnumAsCharAttribute>());
+            Assert.That(typeof(CharEnum).HasAttribute<EnumAsCharAttribute>());
+        }
     }
 
     public class GenericType<T> { }