From 09da9fd9d9a1a493d88da561b8212443fa2ef760 Mon Sep 17 00:00:00 2001 From: jbevain Date: Wed, 15 Oct 2008 18:08:16 +0000 Subject: [PATCH] revert my not so awesome patch git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@115907 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 ----- mono/metadata/reflection.c | 19 +------------------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 22fd41e54..53e1de742 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,8 +1,3 @@ -2008-10-15 Jb Evain - - * reflection.c (build_compressed_metadata): sort the - MONO_TABLE_INTERFACEIMPL table as per the standard. - 2008-10-13 Zoltan Varga * assembly.c (mono_assembly_open_full): Avoid loading images while holding diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 8777770f3..78bb2be54 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -3567,19 +3567,6 @@ compare_declsecurity_attrs (const void *a, const void *b) return a_values [MONO_DECL_SECURITY_PARENT] - b_values [MONO_DECL_SECURITY_PARENT]; } -static int -compare_interface_impl (const void *a, const void *b) -{ - const guint32 *a_values = a; - const guint32 *b_values = b; - - int klass = a_values [MONO_INTERFACEIMPL_CLASS] - b_values [MONO_INTERFACEIMPL_CLASS]; - if (klass) - return klass; - - return a_values [MONO_INTERFACEIMPL_INTERFACE] - b_values [MONO_INTERFACEIMPL_INTERFACE]; -} - static void pad_heap (MonoDynamicStream *sh) { @@ -3642,8 +3629,7 @@ build_compressed_metadata (MonoDynamicImage *assembly) | ((guint64)1 << MONO_TABLE_FIELDLAYOUT) | ((guint64)1 << MONO_TABLE_FIELDRVA) | ((guint64)1 << MONO_TABLE_IMPLMAP) | ((guint64)1 << MONO_TABLE_NESTEDCLASS) | ((guint64)1 << MONO_TABLE_METHODIMPL) | ((guint64)1 << MONO_TABLE_CUSTOMATTRIBUTE) - | ((guint64)1 << MONO_TABLE_DECLSECURITY) | ((guint64)1 << MONO_TABLE_GENERICPARAM) - | ((guint64)1 << MONO_TABLE_INTERFACEIMPL); + | ((guint64)1 << MONO_TABLE_DECLSECURITY) | ((guint64)1 << MONO_TABLE_GENERICPARAM); /* Compute table sizes */ /* the MonoImage has already been created in mono_image_basic_init() */ @@ -3780,9 +3766,6 @@ build_compressed_metadata (MonoDynamicImage *assembly) table = &assembly->tables [MONO_TABLE_DECLSECURITY]; if (table->rows) qsort (table->values + MONO_DECL_SECURITY_SIZE, table->rows, sizeof (guint32) * MONO_DECL_SECURITY_SIZE, compare_declsecurity_attrs); - table = &assembly->tables [MONO_TABLE_INTERFACEIMPL]; - if (table->rows) - qsort (table->values + MONO_INTERFACEIMPL_SIZE, table->rows, sizeof (guint32) * MONO_INTERFACEIMPL_SIZE, compare_interface_impl); /* compress the tables */ for (i = 0; i < MONO_TABLE_NUM; i++){ -- 2.11.4.GIT