Merge pull request #2408 from tastywheattasteslikechicken/MoreInterfaceSupport

Enhance maximum number of supported interfaces from 2^16.

diff --cc mono/metadata/class-internals.h
Simple merge

diff --cc mono/metadata/class.c
index 6e1fb1d8bb9a11e6d42e8bec8f61e50fa52e900e,60e320b6970e94c627e052492430b5ab8b21b71a..042c869adccf3ee198a8e02451ca412ce496b3db
--- 1/mono/metadata/class.c
--- 2/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@@ -2824,9 -2779,9 +2824,9 @@@ mono_unload_interface_id (MonoClass *kl
   * Assign a unique integer ID to the interface represented by @class.
   * The ID will positive and as small as possible.
   * LOCKING: Acquires the classes lock.
 - * Returns: the new ID.
 + * Returns: The new ID.
   */
- static guint
+ static guint32
  mono_get_unique_iid (MonoClass *klass)
  {
        int iid;

diff --cc mono/metadata/marshal.c
Simple merge

diff --cc mono/metadata/object.c
index 78fe267412243c68b3731c189e923d828d31da17,db0047db6484424c6597c6505aef2821a9420789..c25a107fdeb502712987c0c7b5671e8258b1f49d
--- 1/mono/metadata/object.c
--- 2/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@@ -2201,8 -2260,10 +2201,9 @@@ mono_class_proxy_vtable (MonoDomain *do
  {
        MONO_REQ_GC_UNSAFE_MODE;
  
 -      MonoError error;
        MonoVTable *vt, *pvt;
-       int i, j, vtsize, max_interface_id, extra_interface_vtsize = 0;
+       int i, j, vtsize, extra_interface_vtsize = 0;
+       guint32 max_interface_id;
        MonoClass *k;
        GSList *extra_interfaces = NULL;
        MonoClass *klass = remote_class->proxy_class;

diff --cc mono/mini/method-to-ir.c
Simple merge

diff --cc mono/mini/mini-runtime.c
Simple merge