[CoreCLR/NativeAOT] UnsafeAccessorAttribute non-generic support

src/coreclr/tools/Common/TypeSystem/Common/Properties/Resources.resx

@@ -192,4 +192,7 @@
   <data name="MarshalDirectiveGeneric" xml:space="preserve">
     <value>Marshaling directives are invalid</value>
   </data>
+  <data name="AmbiguousMatchUnsafeAccessor" xml:space="preserve">
+    <value>Ambiguity in binding of UnsafeAccessorAttribute.</value>
+  </data>
 </root>

src/coreclr/vm/method.hpp

@@ -1635,19 +1635,7 @@ class MethodDesc
     UINT16      m_wFlags3AndTokenRemainder;
 
     BYTE        m_chunkIndex;
-
-    enum {
-        // enum_flag2_HasPrecode implies that enum_flag2_HasStableEntryPoint is set.
-        enum_flag2_HasStableEntryPoint                  = 0x01,   // The method entrypoint is stable (either precode or actual code)
-        enum_flag2_HasPrecode                           = 0x02,   // Precode has been allocated for this method
-        enum_flag2_IsUnboxingStub                       = 0x04,
-        // unused                                       = 0x08,
-        enum_flag2_IsIntrinsic                          = 0x10,   // Jit may expand method as an intrinsic
-        enum_flag2_IsEligibleForTieredCompilation       = 0x20,
-        enum_flag2_RequiresCovariantReturnTypeChecking  = 0x40
-        // unused                                       = 0x80,
-    };
-    BYTE        m_bFlags2;
+    BYTE        m_methodIndex; // Used to hold the index into the chunk of this MethodDesc. Currently all 8 bits are used, but we could likely work with only 7 bits
 
     // The slot number of this MethodDesc in the vtable array.
     WORD m_wSlotNumber;

src/coreclr/vm/methodtablebuilder.cpp

@@ -3275,7 +3275,7 @@ MethodTableBuilder::EnumerateClassMethods()
         }
 
         // Generic methods should always be mcInstantiated
-        if ((numGenericMethodArgs != 0) && (type != mcInstantiated))
+        if (hasGenericMethodArgs && (type != mcInstantiated))
         {
             BuildMethodTableThrowException(BFA_GENERIC_METHODS_INST);
         }