Skip to content

Commit 3e06daa

Browse files
borsbors
committed
Auto merge of #28521 - arielb1:metadiet, r=eddyb
libcore.rlib reduced from 19121 kiB to 15934 kiB - 20% win. The librustc encoded AST is 9013500 bytes long - for the record, librustc consists of about 2254126 characters. Might be worth looking at. r? @eddyb
2 parents 0369304 + eae41d3 commit 3e06daa

File tree

17 files changed

+473
-547
lines changed

17 files changed

+473
-547
lines changed

‎src/librbml/lib.rs

+45-30
Original file line numberDiff line numberDiff line change
@@ -467,37 +467,44 @@ pub mod reader {
467467
f(&d.data[d.start..d.end])
468468
}
469469

470-
471470
pub fn doc_as_u8(d: Doc) -> u8 {
472471
assert_eq!(d.end, d.start + 1);
473472
d.data[d.start]
474473
}
475474

476-
pub fn doc_as_u16(d: Doc) -> u16 {
477-
assert_eq!(d.end, d.start + 2);
478-
let mut b = [0; 2];
479-
bytes::copy_memory(&d.data[d.start..d.end], &mut b);
480-
unsafe { (*(b.as_ptr() as *const u16)).to_be() }
481-
}
482-
483-
pub fn doc_as_u32(d: Doc) -> u32 {
484-
assert_eq!(d.end, d.start + 4);
485-
let mut b = [0; 4];
486-
bytes::copy_memory(&d.data[d.start..d.end], &mut b);
487-
unsafe { (*(b.as_ptr() as *const u32)).to_be() }
488-
}
489-
490475
pub fn doc_as_u64(d: Doc) -> u64 {
491-
assert_eq!(d.end, d.start + 8);
492-
let mut b = [0; 8];
493-
bytes::copy_memory(&d.data[d.start..d.end], &mut b);
494-
unsafe { (*(b.as_ptr() as *const u64)).to_be() }
476+
if d.end >= 8 {
477+
// For performance, we read 8 big-endian bytes,
478+
// and mask off the junk if there is any. This
479+
// obviously won't work on the first 8 bytes
480+
// of a file - we will fall of the start
481+
// of the page and segfault.
482+
483+
let mut b = [0; 8];
484+
bytes::copy_memory(&d.data[d.end-8..d.end], &mut b);
485+
let data = unsafe { (*(b.as_ptr() as *const u64)).to_be() };
486+
let len = d.end - d.start;
487+
if len < 8 {
488+
data & ((1<<(len*8))-1)
489+
} else {
490+
data
491+
}
492+
} else {
493+
let mut result = 0;
494+
for b in &d.data[d.start..d.end] {
495+
result = (result<<8) + (*b as u64);
496+
}
497+
result
498+
}
495499
}
496500

497-
pub fn doc_as_i8(d: Doc) -> i8 { doc_as_u8(d) as i8 }
498-
pub fn doc_as_i16(d: Doc) -> i16 { doc_as_u16(d) as i16 }
499-
pub fn doc_as_i32(d: Doc) -> i32 { doc_as_u32(d) as i32 }
500-
pub fn doc_as_i64(d: Doc) -> i64 { doc_as_u64(d) as i64 }
501+
#[inline] pub fn doc_as_u16(d: Doc) -> u16 { doc_as_u64(d) as u16 }
502+
#[inline] pub fn doc_as_u32(d: Doc) -> u32 { doc_as_u64(d) as u32 }
503+
504+
#[inline] pub fn doc_as_i8(d: Doc) -> i8 { doc_as_u8(d) as i8 }
505+
#[inline] pub fn doc_as_i16(d: Doc) -> i16 { doc_as_u16(d) as i16 }
506+
#[inline] pub fn doc_as_i32(d: Doc) -> i32 { doc_as_u32(d) as i32 }
507+
#[inline] pub fn doc_as_i64(d: Doc) -> i64 { doc_as_u64(d) as i64 }
501508

502509
pub struct Decoder<'a> {
503510
parent: Doc<'a>,
@@ -907,7 +914,7 @@ pub mod writer {
907914
}
908915
}
909916

910-
fn write_vuint<W: Write>(w: &mut W, n: usize) -> EncodeResult {
917+
pub fn write_vuint<W: Write>(w: &mut W, n: usize) -> EncodeResult {
911918
if n < 0x7f { return write_sized_vuint(w, n, 1); }
912919
if n < 0x4000 { return write_sized_vuint(w, n, 2); }
913920
if n < 0x200000 { return write_sized_vuint(w, n, 3); }
@@ -996,35 +1003,43 @@ pub mod writer {
9961003

9971004
pub fn wr_tagged_u64(&mut self, tag_id: usize, v: u64) -> EncodeResult {
9981005
let bytes: [u8; 8] = unsafe { mem::transmute(v.to_be()) };
999-
self.wr_tagged_bytes(tag_id, &bytes)
1006+
// tagged integers are emitted in big-endian, with no
1007+
// leading zeros.
1008+
let leading_zero_bytes = v.leading_zeros()/8;
1009+
self.wr_tagged_bytes(tag_id, &bytes[leading_zero_bytes as usize..])
10001010
}
10011011

1002-
pub fn wr_tagged_u32(&mut self, tag_id: usize, v: u32) -> EncodeResult{
1003-
let bytes: [u8; 4] = unsafe { mem::transmute(v.to_be()) };
1004-
self.wr_tagged_bytes(tag_id, &bytes)
1012+
#[inline]
1013+
pub fn wr_tagged_u32(&mut self, tag_id: usize, v: u32) -> EncodeResult {
1014+
self.wr_tagged_u64(tag_id, v as u64)
10051015
}
10061016

1017+
#[inline]
10071018
pub fn wr_tagged_u16(&mut self, tag_id: usize, v: u16) -> EncodeResult {
1008-
let bytes: [u8; 2] = unsafe { mem::transmute(v.to_be()) };
1009-
self.wr_tagged_bytes(tag_id, &bytes)
1019+
self.wr_tagged_u64(tag_id, v as u64)
10101020
}
10111021

1022+
#[inline]
10121023
pub fn wr_tagged_u8(&mut self, tag_id: usize, v: u8) -> EncodeResult {
10131024
self.wr_tagged_bytes(tag_id, &[v])
10141025
}
10151026

1027+
#[inline]
10161028
pub fn wr_tagged_i64(&mut self, tag_id: usize, v: i64) -> EncodeResult {
10171029
self.wr_tagged_u64(tag_id, v as u64)
10181030
}
10191031

1032+
#[inline]
10201033
pub fn wr_tagged_i32(&mut self, tag_id: usize, v: i32) -> EncodeResult {
10211034
self.wr_tagged_u32(tag_id, v as u32)
10221035
}
10231036

1037+
#[inline]
10241038
pub fn wr_tagged_i16(&mut self, tag_id: usize, v: i16) -> EncodeResult {
10251039
self.wr_tagged_u16(tag_id, v as u16)
10261040
}
10271041

1042+
#[inline]
10281043
pub fn wr_tagged_i8(&mut self, tag_id: usize, v: i8) -> EncodeResult {
10291044
self.wr_tagged_bytes(tag_id, &[v as u8])
10301045
}

‎src/librustc/metadata/common.rs

+20-41
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ pub const tag_items_data_parent_item: usize = 0x28;
4444
pub const tag_items_data_item_is_tuple_struct_ctor: usize = 0x29;
4545

4646
pub const tag_items_closure_kind: usize = 0x2a;
47-
4847
pub const tag_items_closure_ty: usize = 0x2b;
48+
pub const tag_def_key: usize = 0x2c;
4949

50-
pub const tag_index: usize = 0x2c;
51-
52-
pub const tag_def_key: usize = 0x2d;
50+
// GAP 0x2d 0x2e
5351

54-
// GAP 0x2e
52+
pub const tag_index: usize = 0x110; // top-level only
53+
pub const tag_xref_index: usize = 0x111; // top-level only
54+
pub const tag_xref_data: usize = 0x112; // top-level only
5555

5656
pub const tag_meta_item_name_value: usize = 0x2f;
5757

@@ -80,8 +80,6 @@ pub const tag_crate_dep_crate_name: usize = 0x36;
8080
pub const tag_crate_dep_hash: usize = 0x37;
8181
pub const tag_crate_dep_explicitly_linked: usize = 0x38; // top-level only
8282

83-
pub const tag_mod_impl: usize = 0x39;
84-
8583
pub const tag_item_trait_item: usize = 0x3a;
8684

8785
pub const tag_item_trait_ref: usize = 0x3b;
@@ -95,7 +93,6 @@ pub const tag_path_len: usize = 0x3e;
9593
pub const tag_path_elem_mod: usize = 0x3f;
9694
pub const tag_path_elem_name: usize = 0x40;
9795
pub const tag_item_field: usize = 0x41;
98-
pub const tag_item_field_origin: usize = 0x42;
9996

10097
pub const tag_item_variances: usize = 0x43;
10198
/*
@@ -125,39 +122,27 @@ enum_from_u32! {
125122

126123
tag_tree = 0x51,
127124

128-
tag_id_range = 0x52,
129-
125+
// GAP 0x52
130126
tag_table = 0x53,
131127
// GAP 0x54, 0x55
132128
tag_table_def = 0x56,
133129
tag_table_node_type = 0x57,
134130
tag_table_item_subst = 0x58,
135131
tag_table_freevars = 0x59,
136-
tag_table_tcache = 0x5a,
137-
tag_table_param_defs = 0x5b,
138-
tag_table_mutbl = 0x5c,
139-
tag_table_last_use = 0x5d,
140-
tag_table_spill = 0x5e,
132+
// GAP 0x5a, 0x5b, 0x5c, 0x5d, 0x5e
141133
tag_table_method_map = 0x5f,
142-
tag_table_vtable_map = 0x60,
134+
// GAP 0x60
143135
tag_table_adjustments = 0x61,
144-
tag_table_moves_map = 0x62,
145-
tag_table_capture_map = 0x63,
146-
// GAP 0x64, 0x65
136+
// GAP 0x62, 0x63, 0x64, 0x65
147137
tag_table_upvar_capture_map = 0x66,
148-
tag_table_capture_modes = 0x67,
149-
// GAP 0x68
138+
// GAP 0x67, 0x68
150139
tag_table_const_qualif = 0x69,
151140
tag_table_cast_kinds = 0x6a,
152141
}
153142
}
154143

155144
pub const tag_item_trait_item_sort: usize = 0x70;
156145

157-
pub const tag_item_trait_parent_sort: usize = 0x71;
158-
159-
pub const tag_item_impl_type_basename: usize = 0x72;
160-
161146
pub const tag_crate_triple: usize = 0x105; // top-level only
162147

163148
pub const tag_dylib_dependency_formats: usize = 0x106; // top-level only
@@ -177,23 +162,17 @@ pub const tag_lang_items_missing: usize = 0x76;
177162

178163
pub const tag_item_unnamed_field: usize = 0x77;
179164
pub const tag_items_data_item_visibility: usize = 0x78;
180-
181-
pub const tag_item_method_tps: usize = 0x79;
182-
pub const tag_item_method_fty: usize = 0x7a;
183-
165+
pub const tag_items_data_item_inherent_impl: usize = 0x79;
166+
// GAP 0x7a
184167
pub const tag_mod_child: usize = 0x7b;
185168
pub const tag_misc_info: usize = 0x108; // top-level only
186169
pub const tag_misc_info_crate_items: usize = 0x7c;
187170

188-
// GAP 0x7d
189-
pub const tag_item_impl_vtables: usize = 0x7e;
190-
191171
pub const tag_impls: usize = 0x109; // top-level only
192-
pub const tag_impls_impl: usize = 0x7f;
193-
pub const tag_impls_impl_trait_def_id: usize = 0x8d;
172+
pub const tag_impls_trait: usize = 0x7d;
173+
pub const tag_impls_trait_impl: usize = 0x7e;
194174

195-
pub const tag_items_data_item_inherent_impl: usize = 0x80;
196-
pub const tag_items_data_item_extension_impl: usize = 0x81;
175+
// GAP 0x7f, 0x80, 0x81
197176

198177
pub const tag_native_libraries: usize = 0x10a; // top-level only
199178
pub const tag_native_libraries_lib: usize = 0x82;
@@ -220,10 +199,10 @@ pub struct LinkMeta {
220199

221200
pub const tag_struct_fields: usize = 0x10d; // top-level only
222201
pub const tag_struct_field: usize = 0x8a;
223-
// GAP 0x8b
224202

203+
pub const tag_items_data_item_struct_ctor: usize = 0x8b;
225204
pub const tag_attribute_is_sugared_doc: usize = 0x8c;
226-
205+
// GAP 0x8d
227206
pub const tag_items_data_region: usize = 0x8e;
228207

229208
pub const tag_region_param_def: usize = 0x8f;
@@ -237,9 +216,9 @@ pub const tag_type_param_def: usize = 0x94;
237216
pub const tag_item_generics: usize = 0x95;
238217
pub const tag_method_ty_generics: usize = 0x96;
239218

240-
pub const tag_predicate: usize = 0x97;
241-
pub const tag_predicate_space: usize = 0x98;
242-
pub const tag_predicate_data: usize = 0x99;
219+
pub const tag_type_predicate: usize = 0x97;
220+
pub const tag_self_predicate: usize = 0x98;
221+
pub const tag_fn_predicate: usize = 0x99;
243222

244223
pub const tag_unsafety: usize = 0x9a;
245224

‎src/librustc/metadata/creader.rs

+1
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ impl<'a> CrateReader<'a> {
327327
local_path: RefCell::new(SmallVector::zero()),
328328
local_def_path: RefCell::new(vec![]),
329329
index: decoder::load_index(metadata.as_slice()),
330+
xref_index: decoder::load_xrefs(metadata.as_slice()),
330331
data: metadata,
331332
cnum_map: RefCell::new(cnum_map),
332333
cnum: cnum,

‎src/librustc/metadata/csearch.rs

-6
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,6 @@ pub fn get_associated_consts<'tcx>(tcx: &ty::ctxt<'tcx>, def: DefId)
171171
decoder::get_associated_consts(cstore.intr.clone(), &*cdata, def.index, tcx)
172172
}
173173

174-
pub fn get_type_name_if_impl(cstore: &cstore::CStore, def: DefId)
175-
-> Option<ast::Name> {
176-
let cdata = cstore.get_crate_data(def.krate);
177-
decoder::get_type_name_if_impl(&*cdata, def.index)
178-
}
179-
180174
pub fn get_methods_if_impl(cstore: &cstore::CStore,
181175
def: DefId)
182176
-> Option<Vec<MethodInfo> > {

‎src/librustc/metadata/cstore.rs

+2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ pub struct crate_metadata {
6666
pub codemap_import_info: RefCell<Vec<ImportedFileMap>>,
6767
pub span: codemap::Span,
6868
pub staged_api: bool,
69+
6970
pub index: index::Index,
71+
pub xref_index: index::DenseIndex,
7072

7173
/// Flag if this crate is required by an rlib version of this crate, or in
7274
/// other words whether it was explicitly linked to. An example of a crate

0 commit comments

Comments
 (0)