user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a cross-reference index

Browse source 
it still does not *do* anything
This commit is contained in:
Ariel Ben-Yehuda 2015-09-17 16:04:18 +03:00 • committed by Ariel Ben-Yehuda
parent 67e60bf283
commit d98165941d
6 changed files with 149 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/metadata/common.rs
View file

@ -43,9 +43,11 @@ pub const tag_items_data_parent_item: usize = 0x28;
pub const tag_items_data_item_is_tuple_struct_ctor: usize = 0x29;
pub const tag_index: usize = 0x2a;
pub const tag_index: usize = 0x110; // top-level only
pub const tag_xref_index: usize = 0x111; // top-level only
pub const tag_xref_data: usize = 0x112; // top-level only
// GAP 0x2b, 0x2c, 0x2d, 0x2e
// GAP 0x2a, 0x2b, 0x2c, 0x2d, 0x2e
pub const tag_meta_item_name_value: usize = 0x2f;

1
src/librustc/metadata/creader.rs
View file

@ -326,6 +326,7 @@ impl<'a> CrateReader<'a> {
name: name.to_string(),
local_path: RefCell::new(SmallVector::zero()),
index: decoder::load_index(metadata.as_slice()),
xref_index: decoder::load_xrefs(metadata.as_slice()),
data: metadata,
cnum_map: RefCell::new(cnum_map),
cnum: cnum,

2
src/librustc/metadata/cstore.rs
View file

@ -65,7 +65,9 @@ pub struct crate_metadata {
pub codemap_import_info: RefCell<Vec<ImportedFileMap>>,
pub span: codemap::Span,
pub staged_api: bool,
pub index: index::Index,
pub xref_index: index::DenseIndex,
/// Flag if this crate is required by an rlib version of this crate, or in
/// other words whether it was explicitly linked to. An example of a crate

5
src/librustc/metadata/decoder.rs
View file

@ -82,6 +82,11 @@ pub fn crate_rustc_version(data: &[u8]) -> Option<String> {
reader::maybe_get_doc(doc, tag_rustc_version).map(|s| s.as_str())
}
pub fn load_xrefs(data: &[u8]) -> index::DenseIndex {
let index = reader::get_doc(rbml::Doc::new(data), tag_xref_index);
index::DenseIndex::from_buf(index.data, index.start, index.end)
}
#[derive(Debug, PartialEq)]
enum Family {
ImmStatic, // c

203
src/librustc/metadata/encoder.rs
View file

@ -74,6 +74,24 @@ pub struct EncodeContext<'a, 'tcx: 'a> {
pub reachable: &'a NodeSet,
}
/// "interned" entries referenced by id
#[derive(PartialEq, Eq, Hash)]
pub enum XRef<'tcx> { Unused(&'tcx ()) }
struct CrateIndex<'tcx> {
items: Vec<IndexEntry>,
xrefs: FnvHashMap<XRef<'tcx>, u32>, // sequentially-assigned
}
impl<'tcx> CrateIndex<'tcx> {
fn index_item(&mut self, rbml_w: &mut Encoder, id: NodeId) {
self.items.push(IndexEntry {
node: id,
pos: rbml_w.mark_stable_position(),
});
}
}
fn encode_name(rbml_w: &mut Encoder, name: Name) {
rbml_w.wr_tagged_str(tag_paths_data_name, &name.as_str());
}
@ -263,11 +281,11 @@ fn encode_struct_fields(rbml_w: &mut Encoder,
}
}
fn encode_enum_variant_info(ecx: &EncodeContext,
rbml_w: &mut Encoder,
id: NodeId,
vis: hir::Visibility,
index: &mut Vec<IndexEntry>) {
fn encode_enum_variant_info<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
id: NodeId,
vis: hir::Visibility,
index: &mut CrateIndex<'tcx>) {
debug!("encode_enum_variant_info(id={})", id);
let mut disr_val = 0;
@ -284,10 +302,7 @@ fn encode_enum_variant_info(ecx: &EncodeContext,
}
}
index.push(IndexEntry {
node: vid.node,
pos: rbml_w.mark_stable_position(),
});
index.index_item(rbml_w, vid.node);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, vid);
encode_family(rbml_w, match variant.kind() {
@ -593,15 +608,11 @@ fn encode_item_sort(rbml_w: &mut Encoder, sort: char) {
fn encode_field<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
field: ty::FieldDef<'tcx>,
global_index: &mut Vec<IndexEntry>) {
index: &mut CrateIndex<'tcx>) {
let nm = field.name;
let id = field.did.node;
let pos = rbml_w.mark_stable_position();
global_index.push(IndexEntry {
node: id,
pos: pos,
});
index.index_item(rbml_w, id);
rbml_w.start_tag(tag_items_data_item);
debug!("encode_field: encoding {} {}", nm, id);
encode_struct_field_family(rbml_w, field.vis);
@ -615,17 +626,13 @@ fn encode_field<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w.end_tag();
}
fn encode_info_for_struct_ctor(ecx: &EncodeContext,
rbml_w: &mut Encoder,
name: Name,
ctor_id: NodeId,
index: &mut Vec<IndexEntry>,
struct_id: NodeId) {
index.push(IndexEntry {
node: ctor_id,
pos: rbml_w.mark_stable_position(),
});
fn encode_info_for_struct_ctor<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
name: Name,
ctor_id: NodeId,
index: &mut CrateIndex<'tcx>,
struct_id: NodeId) {
index.index_item(rbml_w, ctor_id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, DefId::local(ctor_id));
encode_family(rbml_w, 'o');
@ -952,21 +959,24 @@ fn encode_stability(rbml_w: &mut Encoder, stab_opt: Option<&attr::Stability>) {
});
}
fn encode_info_for_item(ecx: &EncodeContext,
rbml_w: &mut Encoder,
item: &hir::Item,
index: &mut Vec<IndexEntry>,
path: PathElems,
vis: hir::Visibility) {
let tcx = ecx.tcx;
fn encode_xrefs<'a, 'tcx>(_ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
_xrefs: FnvHashMap<XRef<'tcx>, u32>)
{
rbml_w.start_tag(tag_xref_data);
rbml_w.end_tag();
fn add_to_index(item: &hir::Item, rbml_w: &mut Encoder,
index: &mut Vec<IndexEntry>) {
index.push(IndexEntry {
node: item.id,
pos: rbml_w.mark_stable_position(),
});
}
rbml_w.start_tag(tag_xref_index);
rbml_w.end_tag();
}
fn encode_info_for_item<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
item: &hir::Item,
index: &mut CrateIndex<'tcx>,
path: PathElems,
vis: hir::Visibility) {
let tcx = ecx.tcx;
debug!("encoding info for item at {}",
tcx.sess.codemap().span_to_string(item.span));
@ -976,7 +986,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
match item.node {
hir::ItemStatic(_, m, _) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
if m == hir::MutMutable {
@ -994,7 +1004,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
}
hir::ItemConst(_, _) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'C');
@ -1008,7 +1018,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
}
hir::ItemFn(ref decl, _, constness, _, ref generics, _) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, FN_FAMILY);
@ -1031,7 +1041,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
}
hir::ItemMod(ref m) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
encode_info_for_mod(ecx,
rbml_w,
m,
@ -1042,7 +1052,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
item.vis);
}
hir::ItemForeignMod(ref fm) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'n');
@ -1059,7 +1069,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
}
hir::ItemTy(..) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'y');
@ -1071,7 +1081,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
}
hir::ItemEnum(ref enum_definition, _) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
@ -1104,12 +1114,8 @@ fn encode_info_for_item(ecx: &EncodeContext,
let def = ecx.tcx.lookup_adt_def(def_id);
let variant = def.struct_variant();
for field in &variant.fields {
encode_field(ecx, rbml_w, field, index);
}
/* Index the class*/
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
/* Now, make an item for the class itself */
rbml_w.start_tag(tag_items_data_item);
@ -1137,6 +1143,10 @@ fn encode_info_for_item(ecx: &EncodeContext,
rbml_w.end_tag();
for field in &variant.fields {
encode_field(ecx, rbml_w, field, index);
}
// If this is a tuple-like struct, encode the type of the constructor.
match struct_def.ctor_id {
Some(ctor_id) => {
@ -1147,7 +1157,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
}
}
hir::ItemDefaultImpl(unsafety, _) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'd');
@ -1164,7 +1174,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
let impl_items = tcx.impl_items.borrow();
let items = impl_items.get(&def_id).unwrap();
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'i');
@ -1220,11 +1230,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
None
};
index.push(IndexEntry {
node: trait_item_def_id.def_id().node,
pos: rbml_w.mark_stable_position(),
});
index.index_item(rbml_w, trait_item_def_id.def_id().node);
match tcx.impl_or_trait_item(trait_item_def_id.def_id()) {
ty::ConstTraitItem(ref associated_const) => {
encode_info_for_associated_const(ecx,
@ -1255,7 +1261,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
}
}
hir::ItemTrait(_, _, _, ref ms) => {
add_to_index(item, rbml_w, index);
index.index_item(rbml_w, item.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, def_id);
encode_family(rbml_w, 'I');
@ -1311,11 +1317,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
for (i, &item_def_id) in r.iter().enumerate() {
assert_eq!(item_def_id.def_id().krate, LOCAL_CRATE);
index.push(IndexEntry {
node: item_def_id.def_id().node,
pos: rbml_w.mark_stable_position(),
});
index.index_item(rbml_w, item_def_id.def_id().node);
rbml_w.start_tag(tag_items_data_item);
encode_parent_item(rbml_w, def_id);
@ -1431,17 +1433,13 @@ fn encode_info_for_item(ecx: &EncodeContext,
}
}
fn encode_info_for_foreign_item(ecx: &EncodeContext,
rbml_w: &mut Encoder,
nitem: &hir::ForeignItem,
index: &mut Vec<IndexEntry>,
path: PathElems,
abi: abi::Abi) {
index.push(IndexEntry {
node: nitem.id,
pos: rbml_w.mark_stable_position(),
});
fn encode_info_for_foreign_item<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
nitem: &hir::ForeignItem,
index: &mut CrateIndex<'tcx>,
path: PathElems,
abi: abi::Abi) {
index.index_item(rbml_w, nitem.id);
rbml_w.start_tag(tag_items_data_item);
encode_def_id(rbml_w, DefId::local(nitem.id));
encode_visibility(rbml_w, nitem.vis);
@ -1479,19 +1477,19 @@ fn encode_info_for_foreign_item(ecx: &EncodeContext,
fn my_visit_expr(_e: &hir::Expr) { }
fn my_visit_item(i: &hir::Item,
rbml_w: &mut Encoder,
ecx: &EncodeContext,
index: &mut Vec<IndexEntry>) {
fn my_visit_item<'a, 'tcx>(i: &hir::Item,
rbml_w: &mut Encoder,
ecx: &EncodeContext<'a, 'tcx>,
index: &mut CrateIndex<'tcx>) {
ecx.tcx.map.with_path(i.id, |path| {
encode_info_for_item(ecx, rbml_w, i, index, path, i.vis);
});
}
fn my_visit_foreign_item(ni: &hir::ForeignItem,
rbml_w: &mut Encoder,
ecx: &EncodeContext,
index: &mut Vec<IndexEntry>) {
fn my_visit_foreign_item<'a, 'tcx>(ni: &hir::ForeignItem,
rbml_w: &mut Encoder,
ecx: &EncodeContext<'a, 'tcx>,
index: &mut CrateIndex<'tcx>) {
debug!("writing foreign item {}::{}",
ecx.tcx.map.path_to_string(ni.id),
ni.name);
@ -1507,7 +1505,7 @@ fn my_visit_foreign_item(ni: &hir::ForeignItem,
struct EncodeVisitor<'a, 'b:'a, 'c:'a, 'tcx:'c> {
rbml_w_for_visit_item: &'a mut Encoder<'b>,
ecx: &'a EncodeContext<'c,'tcx>,
index: &'a mut Vec<IndexEntry>,
index: &'a mut CrateIndex<'tcx>,
}
impl<'a, 'b, 'c, 'tcx, 'v> Visitor<'v> for EncodeVisitor<'a, 'b, 'c, 'tcx> {
@ -1531,16 +1529,17 @@ impl<'a, 'b, 'c, 'tcx, 'v> Visitor<'v> for EncodeVisitor<'a, 'b, 'c, 'tcx> {
}
}
fn encode_info_for_items(ecx: &EncodeContext,
rbml_w: &mut Encoder,
krate: &hir::Crate)
-> Vec<IndexEntry> {
let mut index = Vec::new();
fn encode_info_for_items<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
rbml_w: &mut Encoder,
krate: &hir::Crate)
-> CrateIndex<'tcx> {
let mut index = CrateIndex {
items: Vec::new(),
xrefs: FnvHashMap()
};
rbml_w.start_tag(tag_items_data);
index.push(IndexEntry {
node: CRATE_NODE_ID,
pos: rbml_w.mark_stable_position(),
});
index.index_item(rbml_w, CRATE_NODE_ID);
encode_info_for_mod(ecx,
rbml_w,
&krate.module,
@ -1560,10 +1559,7 @@ fn encode_info_for_items(ecx: &EncodeContext,
index
}
fn encode_index(rbml_w: &mut Encoder, index: Vec<IndexEntry>)
fn encode_item_index(rbml_w: &mut Encoder, index: Vec<IndexEntry>)
{
rbml_w.start_tag(tag_index);
index::write_index(index, rbml_w.writer);
@ -1978,6 +1974,7 @@ fn encode_metadata_inner(wr: &mut Cursor<Vec<u8>>,
misc_bytes: u64,
item_bytes: u64,
index_bytes: u64,
xref_bytes: u64,
zero_bytes: u64,
total_bytes: u64,
}
@ -1993,6 +1990,7 @@ fn encode_metadata_inner(wr: &mut Cursor<Vec<u8>>,
misc_bytes: 0,
item_bytes: 0,
index_bytes: 0,
xref_bytes: 0,
zero_bytes: 0,
total_bytes: 0,
};
@ -2074,14 +2072,18 @@ fn encode_metadata_inner(wr: &mut Cursor<Vec<u8>>,
// Encode and index the items.
rbml_w.start_tag(tag_items);
i = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap();
let items_index = encode_info_for_items(&ecx, &mut rbml_w, krate);
let index = encode_info_for_items(&ecx, &mut rbml_w, krate);
stats.item_bytes = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap() - i;
rbml_w.end_tag();
i = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap();
encode_index(&mut rbml_w, items_index);
encode_item_index(&mut rbml_w, index.items);
stats.index_bytes = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap() - i;
i = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap();
encode_xrefs(&ecx, &mut rbml_w, index.xrefs);
stats.xref_bytes = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap() - i;
encode_struct_field_attrs(&mut rbml_w, krate);
stats.total_bytes = rbml_w.writer.seek(SeekFrom::Current(0)).unwrap();
@ -2105,6 +2107,7 @@ fn encode_metadata_inner(wr: &mut Cursor<Vec<u8>>,
println!(" misc bytes: {}", stats.misc_bytes);
println!(" item bytes: {}", stats.item_bytes);
println!(" index bytes: {}", stats.index_bytes);
println!(" xref bytes: {}", stats.xref_bytes);
println!(" zero bytes: {}", stats.zero_bytes);
println!(" total bytes: {}", stats.total_bytes);
}

37
src/librustc/metadata/index.rs
View file

@ -33,8 +33,8 @@ impl IndexArrayEntry {
fn decode_from(b: &[u32]) -> Self {
IndexArrayEntry {
bits: b[0].to_be(),
first_pos: b[1].to_be()
bits: u32::from_be(b[0]),
first_pos: u32::from_be(b[1])
}
}
}
@ -106,7 +106,7 @@ impl Index {
}
fn item_from_pos(&self, positions: &[u32], pos: u32) -> u32 {
positions[pos as usize].to_be()
u32::from_be(positions[pos as usize])
}
#[inline(never)]
@ -149,6 +149,37 @@ impl Index {
}
}
/// A dense index with integer keys
pub struct DenseIndex {
start: usize,
end: usize
}
impl DenseIndex {
pub fn lookup(&self, buf: &[u8], ix: u32) -> Option<u32> {
let data = bytes_to_words(&buf[self.start..self.end]);
data.get(ix as usize).map(|d| u32::from_be(*d))
}
pub fn from_buf(buf: &[u8], start: usize, end: usize) -> Self {
assert!((end-start)%4 == 0 && start <= end && end <= buf.len());
DenseIndex {
start: start,
end: end
}
}
}
pub fn write_dense_index(entries: Vec<u32>, buf: &mut Cursor<Vec<u8>>) {
let elen = entries.len();
assert!(elen < u32::MAX as usize);
for entry in entries {
write_be_u32(buf, entry);
}
info!("write_dense_index: {} entries", elen);
}
fn write_be_u32<W: Write>(w: &mut W, u: u32) {
let _ = w.write_all(&[
(u >> 24) as u8,