Tweaked some numbers

Author: FractalFir

compiler/rustc_middle/src/ty/context.rs

@@ -812,47 +812,35 @@ pub struct CtxtInterners<'tcx> {
 
 impl<'tcx> CtxtInterners<'tcx> {
     fn new(arena: &'tcx WorkerLocal<Arena<'tcx>>) -> CtxtInterners<'tcx> {
+        // Default interner size - this value has been chosen empirically, and may need to be adjusted
+        // as the compiler evolves.  
+        const DEF_INTERN_SIZE:usize = 2048;
         CtxtInterners {
             arena,
-            // From some experiments, it looks like there usualy are < 2^20 types.
-            // 2^20 * 24 bytes ~ 25 MB, which is acceptable IMHO.
-            type_: InternedSet::with_capacity(1048576),
-            // Const lists don't seem to be too common, but I still reserver 128 of them, since
-            // it is cheap anyway
-            const_lists: InternedSet::with_capacity(128),
-            // From some experiments, it looks like there usualy are < 2^20 arg lists.
-            // 2^20 * 8 bytes ~ 9 MB, which is acceptable IMHO.
-            args: InternedSet::with_capacity(1048576),
-            // From some experiments, it looks like there usualy are < 2^19 type_lists.
-            type_lists: InternedSet::with_capacity(524288),
-            region: InternedSet::with_capacity(4096),
-            // There are usually very few `poly_existential_predicates` - for cargo, there were 119.
-            // So, 256 ought to be more than enough for all cases.
-            poly_existential_predicates: InternedSet::with_capacity(256),
-            // There is usually very few `canonical_var_infos` - for cargo, there were 379.
-            // So, 512 ought to be more than enough for all cases.
-            canonical_var_infos: InternedSet::with_capacity(512),
-            predicate: InternedSet::with_capacity(1024),
-            clauses: InternedSet::with_capacity(1024),
-            // Projs don't seem to be too common, but I still reserver 128 of them, since
-            // it is cheap anyway
-            projs: InternedSet::with_capacity(128),
-            // There semes to be > 2^16 place_elems.
-            place_elems: InternedSet::with_capacity(65536),
-            const_: InternedSet::with_capacity(4096),
-            pat: InternedSet::with_capacity(1024),
-            const_allocation: InternedSet::with_capacity(1024),
-            // There is usually < 2^13 bound_variable_kinds
-            bound_variable_kinds: InternedSet::with_capacity(8192),
-            layout: InternedSet::with_capacity(4096),
-            adt_def: InternedSet::with_capacity(1024),
-            external_constraints: InternedSet::with_capacity(1024),
-            predefined_opaques_in_body: InternedSet::with_capacity(1024),
-            fields: InternedSet::with_capacity(4096),
-            local_def_ids: InternedSet::with_capacity(1024),
-            captures: InternedSet::with_capacity(1024),
-            offset_of: InternedSet::with_capacity(1024),
-            valtree: InternedSet::with_capacity(1024),
+            type_: InternedSet::with_capacity(DEF_INTERN_SIZE * 16),
+            const_lists: InternedSet::with_capacity(DEF_INTERN_SIZE * 4),
+            args: InternedSet::with_capacity(DEF_INTERN_SIZE * 4),
+            type_lists: InternedSet::with_capacity(DEF_INTERN_SIZE * 4),
+            region: InternedSet::with_capacity(DEF_INTERN_SIZE * 4),
+            poly_existential_predicates: InternedSet::with_capacity(DEF_INTERN_SIZE/4),
+            canonical_var_infos: InternedSet::with_capacity(DEF_INTERN_SIZE/2),
+            predicate: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            clauses: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            projs: InternedSet::with_capacity(DEF_INTERN_SIZE*4),
+            place_elems: InternedSet::with_capacity(DEF_INTERN_SIZE*2),
+            const_: InternedSet::with_capacity(DEF_INTERN_SIZE*2),
+            pat: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            const_allocation: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            bound_variable_kinds: InternedSet::with_capacity(DEF_INTERN_SIZE*2),
+            layout: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            adt_def: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            external_constraints: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            predefined_opaques_in_body: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            fields: InternedSet::with_capacity(DEF_INTERN_SIZE*4),
+            local_def_ids: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            captures: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            offset_of: InternedSet::with_capacity(DEF_INTERN_SIZE),
+            valtree: InternedSet::with_capacity(DEF_INTERN_SIZE),
         }
     }