Revert "[runtime] Fix the computation of token sizes in ppdb files, the PDB stream...

This reverts commit c35cdfa2dec8c15fdf49a6032c437751a97a5e08.

Revert this as it causes test failures.

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index e56bc0d62c19a6d8ef9ef7ffc45ea4474a303bd7..504b64294e0c053a002d038563ab131cbfc487e9 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -594,23 +594,6 @@ load_tables (MonoImage *image)
        /* They must be the same */
        g_assert ((const void *) image->tables_base == (const void *) rows);
 
-       if (image->heap_pdb.size) {
-               /*
-                * Obtain token sizes from the pdb stream.
-                */
-               /* 24 = guid + entry point */
-               int pos = 24;
-               image->referenced_tables = read64 (image->heap_pdb.data + pos);
-               pos += 8;
-               image->referenced_table_rows = g_new0 (int, 64);
-               for (int i = 0; i < 64; ++i) {
-                       if (image->referenced_tables & (1UL << i)) {
-                               image->referenced_table_rows [i] = read32 (image->heap_pdb.data + pos);
-                               pos += 4;
-                       }
-               }
-       }
-
        mono_metadata_compute_table_bases (image);
        return TRUE;
 }

diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h
index ae524c9f35164b83d38898cbae52b152d5900a3c..60b34a1880dafa4d034cb0a2675b276bce4ac90c 100644 (file)
--- a/mono/metadata/metadata-internals.h
+++ b/mono/metadata/metadata-internals.h
@@ -248,10 +248,6 @@ struct _MonoImage {
                            
        const char          *tables_base;
 
-       /* For PPDB files */
-       guint64 referenced_tables;
-       int *referenced_table_rows;
-
        /**/
        MonoTableInfo        tables [MONO_TABLE_NUM];
 

diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c
index e44b64dd62a8ba43afe809ad10c605ef58290d6b..586712cfa90659a66e7f352dad1caa8f69a95336 100644 (file)
--- a/mono/metadata/metadata.c
+++ b/mono/metadata/metadata.c
@@ -551,24 +551,7 @@ inverse of this mapping.
 
  */
 #define rtsize(meta,s,b) (((s) < (1 << (b)) ? 2 : 4))
-
-static inline int
-idx_size (MonoImage *meta, int tableidx)
-{
-       if (meta->referenced_tables && (meta->referenced_tables & (1UL << tableidx)))
-               return meta->referenced_table_rows [tableidx] < 65536 ? 2 : 4;
-       else
-               return meta->tables [tableidx].rows < 65536 ? 2 : 4;
-}
-
-static inline int
-get_nrows (MonoImage *meta, int tableidx)
-{
-       if (meta->referenced_tables && (meta->referenced_tables & (1UL << tableidx)))
-               return meta->referenced_table_rows [tableidx];
-       else
-               return meta->tables [tableidx].rows;
-}
+#define idx_size(meta,tableidx) ((meta)->tables [(tableidx)].rows < 65536 ? 2 : 4)
 
 /* Reference: Partition II - 23.2.6 */
 /*
@@ -688,7 +671,7 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                                break;
                        case MONO_TABLE_GENERICPARAM:
                                g_assert (i == 2);
-                               n = MAX (get_nrows (meta, MONO_TABLE_METHOD), get_nrows (meta, MONO_TABLE_TYPEDEF));
+                               n = MAX (meta->tables [MONO_TABLE_METHOD].rows, meta->tables [MONO_TABLE_TYPEDEF].rows);
                                /*This is a coded token for 2 tables, so takes 1 bit */
                                field_size = rtsize (meta, n, 16 - MONO_TYPEORMETHOD_BITS);
                                break;
@@ -734,9 +717,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * HasConstant: ParamDef, FieldDef, Property
                         */
                case MONO_MT_CONST_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_PARAM),
-                                get_nrows (meta, MONO_TABLE_FIELD));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_PROPERTY));
+                       n = MAX (meta->tables [MONO_TABLE_PARAM].rows,
+                                meta->tables [MONO_TABLE_FIELD].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_PROPERTY].rows);
 
                        /* 2 bits to encode tag */
                        field_size = rtsize (meta, n, 16-2);
@@ -758,28 +741,28 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                                break;
                        }*/
                        
-                       n = MAX (get_nrows (meta, MONO_TABLE_METHOD),
-                                get_nrows (meta, MONO_TABLE_FIELD));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPEDEF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_PARAM));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_INTERFACEIMPL));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MEMBERREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MODULE));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_DECLSECURITY));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_PROPERTY));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_EVENT));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_STANDALONESIG));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MODULEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPESPEC));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_ASSEMBLY));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_ASSEMBLYREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_FILE));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_EXPORTEDTYPE));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MANIFESTRESOURCE));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_GENERICPARAM));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_GENERICPARAMCONSTRAINT));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_METHODSPEC));
+                       n = MAX (meta->tables [MONO_TABLE_METHOD].rows,
+                                meta->tables [MONO_TABLE_FIELD].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPEDEF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_PARAM].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_INTERFACEIMPL].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MEMBERREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MODULE].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_DECLSECURITY].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_PROPERTY].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_EVENT].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_STANDALONESIG].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MODULEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPESPEC].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_ASSEMBLY].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_ASSEMBLYREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_FILE].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_EXPORTEDTYPE].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MANIFESTRESOURCE].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_GENERICPARAM].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_GENERICPARAMCONSTRAINT].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_METHODSPEC].rows);
 
                        /* 5 bits to encode */
                        field_size = rtsize (meta, n, 16-5);
@@ -791,33 +774,33 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                        */
 
                case MONO_MT_HASCUSTDEBUG_IDX:
-                       n = get_nrows (meta, MONO_TABLE_METHOD);
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_FIELD));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_TYPEREF));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_TYPEDEF));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_PARAM));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_INTERFACEIMPL));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_MEMBERREF));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_MODULE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_DECLSECURITY));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_PROPERTY));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_EVENT));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_STANDALONESIG));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_MODULEREF));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_TYPESPEC));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_ASSEMBLY));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_ASSEMBLYREF));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_FILE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_EXPORTEDTYPE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_MANIFESTRESOURCE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_GENERICPARAM));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_GENERICPARAMCONSTRAINT));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_METHODSPEC));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_DOCUMENT));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_LOCALSCOPE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_LOCALVARIABLE));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_LOCALCONSTANT));
-                       n = MAX(n, get_nrows (meta, MONO_TABLE_IMPORTSCOPE));
+                       n = MAX(meta->tables[MONO_TABLE_METHOD].rows,
+                               meta->tables[MONO_TABLE_FIELD].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_TYPEREF].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_TYPEDEF].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_PARAM].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_INTERFACEIMPL].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_MEMBERREF].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_MODULE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_DECLSECURITY].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_PROPERTY].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_EVENT].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_STANDALONESIG].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_MODULEREF].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_TYPESPEC].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_ASSEMBLY].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_ASSEMBLYREF].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_FILE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_EXPORTEDTYPE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_MANIFESTRESOURCE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_GENERICPARAM].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_GENERICPARAMCONSTRAINT].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_METHODSPEC].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_DOCUMENT].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_LOCALSCOPE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_LOCALVARIABLE].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_LOCALCONSTANT].rows);
+                       n = MAX(n, meta->tables[MONO_TABLE_IMPORTSCOPE].rows);
 
                        /* 5 bits to encode */
                        field_size = rtsize(meta, n, 16 - 5);
@@ -835,10 +818,10 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                                break;
                        }*/
                        
-                       n = MAX (get_nrows (meta, MONO_TABLE_TYPEREF),
-                                get_nrows (meta, MONO_TABLE_TYPEDEF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_METHOD));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MEMBERREF));
+                       n = MAX (meta->tables [MONO_TABLE_TYPEREF].rows,
+                                meta->tables [MONO_TABLE_TYPEDEF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_METHOD].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MEMBERREF].rows);
 
                        /* 3 bits to encode */
                        field_size = rtsize (meta, n, 16-3);
@@ -848,9 +831,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * HasDeclSecurity: Typedef, MethodDef, Assembly
                         */
                case MONO_MT_HASDEC_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_TYPEDEF),
-                                get_nrows (meta, MONO_TABLE_METHOD));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_ASSEMBLY));
+                       n = MAX (meta->tables [MONO_TABLE_TYPEDEF].rows,
+                                meta->tables [MONO_TABLE_METHOD].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_ASSEMBLY].rows);
 
                        /* 2 bits to encode */
                        field_size = rtsize (meta, n, 16-2);
@@ -860,9 +843,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * Implementation: File, AssemblyRef, ExportedType
                         */
                case MONO_MT_IMPL_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_FILE),
-                                get_nrows (meta, MONO_TABLE_ASSEMBLYREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_EXPORTEDTYPE));
+                       n = MAX (meta->tables [MONO_TABLE_FILE].rows,
+                                meta->tables [MONO_TABLE_ASSEMBLYREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_EXPORTEDTYPE].rows);
 
                        /* 2 bits to encode tag */
                        field_size = rtsize (meta, n, 16-2);
@@ -872,8 +855,8 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * HasFieldMarshall: FieldDef, ParamDef
                         */
                case MONO_MT_HFM_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_FIELD),
-                                get_nrows (meta, MONO_TABLE_PARAM));
+                       n = MAX (meta->tables [MONO_TABLE_FIELD].rows,
+                                meta->tables [MONO_TABLE_PARAM].rows);
 
                        /* 1 bit used to encode tag */
                        field_size = rtsize (meta, n, 16-1);
@@ -883,8 +866,8 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * MemberForwarded: FieldDef, MethodDef
                         */
                case MONO_MT_MF_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_FIELD),
-                                get_nrows (meta, MONO_TABLE_METHOD));
+                       n = MAX (meta->tables [MONO_TABLE_FIELD].rows,
+                                meta->tables [MONO_TABLE_METHOD].rows);
 
                        /* 1 bit used to encode tag */
                        field_size = rtsize (meta, n, 16-1);
@@ -896,9 +879,9 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * It is TypeDef, _TypeRef_, TypeSpec, instead.
                         */
                case MONO_MT_TDOR_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_TYPEDEF),
-                                get_nrows (meta, MONO_TABLE_TYPEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPESPEC));
+                       n = MAX (meta->tables [MONO_TABLE_TYPEDEF].rows,
+                                meta->tables [MONO_TABLE_TYPEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPESPEC].rows);
 
                        /* 2 bits to encode */
                        field_size = rtsize (meta, n, 16-2);
@@ -908,11 +891,11 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * MemberRefParent: TypeDef, TypeRef, MethodDef, ModuleRef, TypeSpec, MemberRef
                         */
                case MONO_MT_MRP_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_TYPEDEF),
-                                get_nrows (meta, MONO_TABLE_TYPEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_METHOD));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_MODULEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPESPEC));
+                       n = MAX (meta->tables [MONO_TABLE_TYPEDEF].rows,
+                                meta->tables [MONO_TABLE_TYPEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_METHOD].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_MODULEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPESPEC].rows);
 
                        /* 3 bits to encode */
                        field_size = rtsize (meta, n, 16 - 3);
@@ -922,8 +905,8 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * MethodDefOrRef: MethodDef, MemberRef
                         */
                case MONO_MT_MDOR_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_METHOD),
-                                get_nrows (meta, MONO_TABLE_MEMBERREF));
+                       n = MAX (meta->tables [MONO_TABLE_METHOD].rows,
+                                meta->tables [MONO_TABLE_MEMBERREF].rows);
 
                        /* 1 bit used to encode tag */
                        field_size = rtsize (meta, n, 16-1);
@@ -933,8 +916,8 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * HasSemantics: Property, Event
                         */
                case MONO_MT_HS_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_PROPERTY),
-                                get_nrows (meta, MONO_TABLE_EVENT));
+                       n = MAX (meta->tables [MONO_TABLE_PROPERTY].rows,
+                                meta->tables [MONO_TABLE_EVENT].rows);
 
                        /* 1 bit used to encode tag */
                        field_size = rtsize (meta, n, 16-1);
@@ -944,10 +927,10 @@ mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bit
                         * ResolutionScope: Module, ModuleRef, AssemblyRef, TypeRef
                         */
                case MONO_MT_RS_IDX:
-                       n = MAX (get_nrows (meta, MONO_TABLE_MODULE),
-                                get_nrows (meta, MONO_TABLE_MODULEREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_ASSEMBLYREF));
-                       n = MAX (n, get_nrows (meta, MONO_TABLE_TYPEREF));
+                       n = MAX (meta->tables [MONO_TABLE_MODULE].rows,
+                                meta->tables [MONO_TABLE_MODULEREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_ASSEMBLYREF].rows);
+                       n = MAX (n, meta->tables [MONO_TABLE_TYPEREF].rows);
 
                        /* 2 bits used to encode tag (ECMA spec claims 3) */
                        field_size = rtsize (meta, n, 16 - 2);