Fix attribute enumerator

- Advance now checks not only table but also owner index for a full match.
- Method index is now parsed from compressed token format.

Author: josesimoes

src/CLR/Core/TypeSystem.cpp

@@ -6371,19 +6371,21 @@ bool CLR_RT_AttributeEnumerator::Advance()
         ptr++;
         num--;
 
-        if (ptr->Key() == key)
+        if (ptr->Key() == key && ptr->ownerIndex == m_data.ownerIndex)
         {
-            CLR_INDEX tk = ptr->constructor;
-            // check TYPEDEF
-            if (tk & 0x8000)
-            {
-                m_match = m_assm->crossReferenceMethodRef[tk & 0x7FFF].target;
-            }
-            else
+            // get the token of the constructor (compressed format)
+            CLR_UINT32 token = CLR_UncompressMethodToken(ptr->constructor);
+
+            // get the method definition, by resolving the token
+            CLR_RT_MethodDef_Instance method{};
+            if (method.ResolveToken(token, m_assm) == false)
             {
-                m_match.Set(m_assm->assemblyIndex, tk);
+                ASSERT(0);
             }
 
+            // get the method definition index
+            m_match.data = method.data;
+
             m_blob = m_assm->GetSignature(ptr->data);
 
             fRes = true;