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

rustc: Write out an index of definition info in crate metadata

Browse source
This commit is contained in:
Patrick Walton 2011-03-31 11:56:02 -07:00
parent 6a60cb1e0c
commit 3945ace520
3 changed files with 111 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/comp/front/creader.rs
View file

@ -275,8 +275,7 @@ impure fn resolve_path(vec[ast.ident] path, vec[u8] data) -> resolve_result {
ebml.move_to_parent(ebml_r);
auto nm = _str.unsafe_from_bytes(name_data);
name_opt = some[ast.ident](nm);
} else if (inner_tag.id ==
metadata.tag_items_def_id) {
} else if (inner_tag.id == metadata.tag_def_id) {
ebml.move_to_first_child(ebml_r);
auto did_data = ebml.read_data(ebml_r);
ebml.move_to_parent(ebml_r);
@ -336,13 +335,12 @@ impure fn move_to_item(&ebml.reader ebml_r, int item_id) {
while (ebml.bytes_left(ebml_r) > 0u) {
auto inner_ebml_tag = ebml.peek(ebml_r);
if (inner_ebml_tag.id == metadata.tag_items_item) {
if (inner_ebml_tag.id == metadata.tag_items_data_item) {
ebml.move_to_first_child(ebml_r);
while (ebml.bytes_left(ebml_r) > 0u) {
auto innermost_ebml_tag = ebml.peek(ebml_r);
if (innermost_ebml_tag.id ==
metadata.tag_items_def_id) {
if (innermost_ebml_tag.id == metadata.tag_def_id) {
ebml.move_to_first_child(ebml_r);
auto did_data = ebml.read_data(ebml_r);
ebml.move_to_parent(ebml_r);
@ -408,7 +406,7 @@ impure fn get_item_kind(&ebml.reader ebml_r) -> u8 {
ret data.(0);
}
auto f = converter;
ret get_item_generic[u8](ebml_r, metadata.tag_items_kind, f);
ret get_item_generic[u8](ebml_r, metadata.tag_items_data_item_kind, f);
}
impure fn get_item_symbol(&ebml.reader ebml_r) -> str {
@ -418,7 +416,7 @@ impure fn get_item_symbol(&ebml.reader ebml_r) -> str {
ret _str.unsafe_from_bytes(data);
}
auto f = converter;
ret get_item_generic[str](ebml_r, metadata.tag_items_symbol, f);
ret get_item_generic[str](ebml_r, metadata.tag_items_data_item_symbol, f);
}
// FIXME: This is a *terrible* botch.
@ -430,7 +428,8 @@ impure fn impure_parse_def_id(vec[u8] data) -> ast.def_id {
impure fn get_variant_tag_id(&ebml.reader ebml_r) -> ast.def_id {
auto f = impure_parse_def_id;
ret get_item_generic[ast.def_id](ebml_r, metadata.tag_items_tag_id, f);
ret get_item_generic[ast.def_id](ebml_r,
metadata.tag_items_data_item_tag_id, f);
}
impure fn get_item_type(&ebml.reader ebml_r, int this_cnum) -> @ty.t {
@ -448,7 +447,7 @@ impure fn get_item_type(&ebml.reader ebml_r, int this_cnum) -> @ty.t {
ret parse_ty_str(s, bind parse_external_def_id(this_cnum, _));
}
auto f = bind converter(this_cnum, _);
ret get_item_generic[@ty.t](ebml_r, metadata.tag_items_type, f);
ret get_item_generic[@ty.t](ebml_r, metadata.tag_items_data_item_type, f);
}
impure fn get_item_ty_params(&ebml.reader ebml_r, int this_cnum)
@ -456,7 +455,7 @@ impure fn get_item_ty_params(&ebml.reader ebml_r, int this_cnum)
let vec[ast.def_id] tps = vec();
while (ebml.bytes_left(ebml_r) > 0u) {
auto ebml_tag = ebml.peek(ebml_r);
if (ebml_tag.id == metadata.tag_items_ty_param) {
if (ebml_tag.id == metadata.tag_items_data_item_ty_param) {
ebml.move_to_first_child(ebml_r);
auto data = ebml.read_data(ebml_r);

130
src/comp/middle/metadata.rs
View file

@ -1,4 +1,5 @@
import std._str;
import std._uint;
import std._vec;
import std.ebml;
import std.io;
@ -22,15 +23,23 @@ const uint tag_paths_name = 0x03u;
const uint tag_paths_item = 0x04u;
const uint tag_paths_mod = 0x05u;
const uint tag_items_item = 0x06u;
const uint tag_items_def_id = 0x07u;
const uint tag_items_kind = 0x08u;
const uint tag_items_ty_param = 0x09u;
const uint tag_items_type = 0x0au;
const uint tag_items_symbol = 0x0bu;
const uint tag_items_variant = 0x0cu;
const uint tag_items_tag_id = 0x0du;
const uint tag_items_obj_type_id = 0x0eu;
const uint tag_def_id = 0x06u;
const uint tag_items_data = 0x07u;
const uint tag_items_data_item = 0x08u;
const uint tag_items_data_item_kind = 0x09u;
const uint tag_items_data_item_ty_param = 0x0au;
const uint tag_items_data_item_type = 0x0bu;
const uint tag_items_data_item_symbol = 0x0cu;
const uint tag_items_data_item_variant = 0x0du;
const uint tag_items_data_item_tag_id = 0x0eu;
const uint tag_items_data_item_obj_type_id = 0x0fu;
const uint tag_items_index = 0x10u;
const uint tag_items_index_buckets = 0x11u;
const uint tag_items_index_buckets_bucket = 0x12u;
const uint tag_items_index_buckets_bucket_elt = 0x13u;
const uint tag_items_index_table = 0x14u;
// Type encoding
@ -161,7 +170,7 @@ fn encode_name(&ebml.writer ebml_w, str name) {
}
fn encode_def_id(&ebml.writer ebml_w, &ast.def_id id) {
ebml.start_tag(ebml_w, tag_items_def_id);
ebml.start_tag(ebml_w, tag_def_id);
ebml_w.writer.write(_str.bytes(def_to_str(id)));
ebml.end_tag(ebml_w);
}
@ -259,7 +268,7 @@ fn encode_item_paths(&ebml.writer ebml_w, @ast.crate crate) {
// Item info table encoding
fn encode_kind(&ebml.writer ebml_w, u8 c) {
ebml.start_tag(ebml_w, tag_items_kind);
ebml.start_tag(ebml_w, tag_items_data_item_kind);
ebml_w.writer.write(vec(c));
ebml.end_tag(ebml_w);
}
@ -271,40 +280,40 @@ fn def_to_str(ast.def_id did) -> str {
// TODO: We need to encode the "crate numbers" somewhere for diamond imports.
fn encode_type_params(&ebml.writer ebml_w, vec[ast.ty_param] tps) {
for (ast.ty_param tp in tps) {
ebml.start_tag(ebml_w, tag_items_ty_param);
ebml.start_tag(ebml_w, tag_items_data_item_ty_param);
ebml_w.writer.write(_str.bytes(def_to_str(tp.id)));
ebml.end_tag(ebml_w);
}
}
fn encode_type(&ebml.writer ebml_w, @ty.t typ) {
ebml.start_tag(ebml_w, tag_items_type);
ebml.start_tag(ebml_w, tag_items_data_item_type);
auto f = def_to_str;
ebml_w.writer.write(_str.bytes(ty_str(typ, f)));
ebml.end_tag(ebml_w);
}
fn encode_symbol(@trans.crate_ctxt cx, &ebml.writer ebml_w, ast.def_id did) {
ebml.start_tag(ebml_w, tag_items_symbol);
ebml.start_tag(ebml_w, tag_items_data_item_symbol);
ebml_w.writer.write(_str.bytes(cx.item_symbols.get(did)));
ebml.end_tag(ebml_w);
}
fn encode_discriminant(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ast.def_id did) {
ebml.start_tag(ebml_w, tag_items_symbol);
ebml.start_tag(ebml_w, tag_items_data_item_symbol);
ebml_w.writer.write(_str.bytes(cx.discrim_symbols.get(did)));
ebml.end_tag(ebml_w);
}
fn encode_tag_id(&ebml.writer ebml_w, &ast.def_id id) {
ebml.start_tag(ebml_w, tag_items_tag_id);
ebml.start_tag(ebml_w, tag_items_data_item_tag_id);
ebml_w.writer.write(_str.bytes(def_to_str(id)));
ebml.end_tag(ebml_w);
}
fn encode_obj_type_id(&ebml.writer ebml_w, &ast.def_id id) {
ebml.start_tag(ebml_w, tag_items_obj_type_id);
ebml.start_tag(ebml_w, tag_items_data_item_obj_type_id);
ebml_w.writer.write(_str.bytes(def_to_str(id)));
ebml.end_tag(ebml_w);
}
@ -313,7 +322,7 @@ fn encode_obj_type_id(&ebml.writer ebml_w, &ast.def_id id) {
fn encode_tag_variant_info(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ast.def_id did, vec[ast.variant] variants) {
for (ast.variant variant in variants) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, variant.node.id);
encode_kind(ebml_w, 'v' as u8);
encode_tag_id(ebml_w, did);
@ -330,7 +339,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
@ast.item item) {
alt (item.node) {
case (ast.item_const(_, _, _, ?did, ?ann)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 'c' as u8);
encode_type(ebml_w, trans.node_ann_type(cx, ann));
@ -338,7 +347,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ebml.end_tag(ebml_w);
}
case (ast.item_fn(_, _, ?tps, ?did, ?ann)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 'f' as u8);
encode_type_params(ebml_w, tps);
@ -347,19 +356,19 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ebml.end_tag(ebml_w);
}
case (ast.item_mod(_, _, ?did)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 'm' as u8);
ebml.end_tag(ebml_w);
}
case (ast.item_native_mod(_, _, ?did)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 'n' as u8);
ebml.end_tag(ebml_w);
}
case (ast.item_ty(?id, _, ?tps, ?did, ?ann)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 'y' as u8);
encode_type_params(ebml_w, tps);
@ -367,7 +376,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ebml.end_tag(ebml_w);
}
case (ast.item_tag(?id, ?variants, ?tps, ?did)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, did);
encode_kind(ebml_w, 't' as u8);
encode_type_params(ebml_w, tps);
@ -376,7 +385,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
encode_tag_variant_info(cx, ebml_w, did, variants);
}
case (ast.item_obj(?id, _, ?tps, ?odid, ?ann)) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, odid.ctor);
encode_kind(ebml_w, 'o' as u8);
encode_type_params(ebml_w, tps);
@ -385,7 +394,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
encode_symbol(cx, ebml_w, odid.ctor);
ebml.end_tag(ebml_w);
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
encode_def_id(ebml_w, odid.ty);
encode_kind(ebml_w, 'y' as u8);
encode_type_params(ebml_w, tps);
@ -397,7 +406,7 @@ fn encode_info_for_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
fn encode_info_for_native_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
@ast.native_item nitem) {
ebml.start_tag(ebml_w, tag_items_item);
ebml.start_tag(ebml_w, tag_items_data_item);
alt (nitem.node) {
case (ast.native_item_ty(_, ?did)) {
encode_def_id(ebml_w, did);
@ -413,26 +422,87 @@ fn encode_info_for_native_item(@trans.crate_ctxt cx, &ebml.writer ebml_w,
ebml.end_tag(ebml_w);
}
fn encode_info_for_items(@trans.crate_ctxt cx, &ebml.writer ebml_w) {
fn encode_info_for_items(@trans.crate_ctxt cx, &ebml.writer ebml_w)
-> vec[tup(ast.def_id, uint)] {
let vec[tup(ast.def_id, uint)] index = vec();
ebml.start_tag(ebml_w, tag_items);
for each (@tup(ast.def_id, @ast.item) kvp in cx.items.items()) {
index += vec(tup(kvp._0, ebml_w.writer.tell()));
encode_info_for_item(cx, ebml_w, kvp._1);
}
for each (@tup(ast.def_id, @ast.native_item) kvp in
cx.native_items.items()) {
index += vec(tup(kvp._0, ebml_w.writer.tell()));
encode_info_for_native_item(cx, ebml_w, kvp._1);
}
ebml.end_tag(ebml_w);
ret index;
}
// Definition ID indexing
fn create_index(vec[tup(ast.def_id, uint)] index)
-> vec[vec[tup(ast.def_id, uint)]] {
let vec[vec[tup(ast.def_id, uint)]] buckets = vec();
for each (uint i in _uint.range(0u, 256u)) {
let vec[tup(ast.def_id, uint)] bucket = vec();
buckets += vec(bucket);
}
for (tup(ast.def_id, uint) elt in index) {
auto h = common.hash_def(elt._0);
buckets.(h % 256u) += vec(elt);
}
ret buckets;
}
impure fn encode_index(&ebml.writer ebml_w,
vec[tup(ast.def_id, uint)] index) {
auto writer = io.new_writer_(ebml_w.writer);
auto buckets = create_index(index);
ebml.start_tag(ebml_w, tag_items_index);
let vec[uint] bucket_locs = vec();
ebml.start_tag(ebml_w, tag_items_index_buckets);
for (vec[tup(ast.def_id, uint)] bucket in buckets) {
bucket_locs += vec(ebml_w.writer.tell());
ebml.start_tag(ebml_w, tag_items_index_buckets_bucket);
for (tup(ast.def_id, uint) elt in bucket) {
ebml.start_tag(ebml_w, tag_items_index_buckets_bucket_elt);
writer.write_be_uint(elt._1, 4u);
writer.write_str(def_to_str(elt._0));
ebml.end_tag(ebml_w);
}
ebml.end_tag(ebml_w);
}
ebml.end_tag(ebml_w);
ebml.start_tag(ebml_w, tag_items_index_table);
for (uint pos in bucket_locs) {
writer.write_be_uint(pos, 4u);
}
ebml.end_tag(ebml_w);
ebml.end_tag(ebml_w);
}
fn encode_metadata(@trans.crate_ctxt cx, @ast.crate crate) -> ValueRef {
impure fn encode_metadata(@trans.crate_ctxt cx, @ast.crate crate)
-> ValueRef {
auto string_w = io.string_writer();
auto buf_w = string_w.get_writer().get_buf_writer();
auto ebml_w = ebml.create_writer(buf_w);
encode_item_paths(ebml_w, crate);
encode_info_for_items(cx, ebml_w);
auto index = encode_info_for_items(cx, ebml_w);
encode_index(ebml_w, index);
ret C_postr(string_w.get_str());
}

2
src/comp/rustc.rc
View file

@ -48,6 +48,8 @@ auth front.creader.get_type = impure;
auth front.creader.get_symbol = impure;
auth front.creader.impure_no_op = impure;
auth middle.metadata = unsafe;
auth middle.metadata.encode_index = impure;
auth middle.metadata.encode_metadata = impure;
auth middle.trans = unsafe;
auth middle.trans.copy_any_self_to_alloca = impure;
auth middle.trans.copy_args_to_allocas = impure;