mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make trans use the new ast_map instead of building its own

Browse Source
This commit is contained in:
Marijn Haverbeke 2011-06-20 10:43:33 +02:00
parent 854b3a9b73
commit 588dc3897b
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/comp/driver/rustc.rs
View File

@ -96,8 +96,8 @@ fn compile_input(session::session sess, eval::env env, str input,
bind middle::alias::check_crate(@ty_cx, crate));
auto llmod =
time[llvm::llvm::ModuleRef](time_passes, "translation",
bind trans::trans_crate(sess, crate,
ty_cx, output));
bind trans::trans_crate
(sess, crate, ty_cx, output, ast_map));
time[()](time_passes, "LLVM passes",
bind link::write::run_passes(sess, llmod, output));
}

20
src/comp/middle/metadata.rs
View File

@ -603,14 +603,18 @@ fn encode_info_for_items(&@trans::crate_ctxt cx, &ebml::writer ebml_w) ->
vec[tup(int, uint)] {
let vec[tup(int, uint)] index = [];
ebml::start_tag(ebml_w, tag_items_data);
for each (@tup(node_id, @item) kvp in cx.items.items()) {
index += [tup(kvp._0, ebml_w.writer.tell())];
encode_info_for_item(cx, ebml_w, kvp._1, index);
}
for each (@tup(node_id, @native_item) kvp in
cx.native_items.items()) {
index += [tup(kvp._0, ebml_w.writer.tell())];
encode_info_for_native_item(cx, ebml_w, kvp._1);
for each (@tup(node_id, ast_map::ast_node) kvp in cx.ast_map.items()) {
alt (kvp._1) {
case (ast_map::node_item(?i)) {
index += [tup(kvp._0, ebml_w.writer.tell())];
encode_info_for_item(cx, ebml_w, i, index);
}
case (ast_map::node_native_item(?i)) {
index += [tup(kvp._0, ebml_w.writer.tell())];
encode_info_for_native_item(cx, ebml_w, i);
}
case (_) {}
}
}
ebml::end_tag(ebml_w);
ret index;

28
src/comp/middle/trans.rs
View File

@ -126,8 +126,7 @@ type crate_ctxt =
// of the first instruction of the item's definition in the executable
// we're generating.
hashmap[ast::node_id, ValueRef] item_ids,
hashmap[ast::node_id, @ast::item] items,
hashmap[ast::node_id, @ast::native_item] native_items,
ast_map::map ast_map,
hashmap[ast::node_id, str] item_symbols,
mutable option::t[ValueRef] main_fn,
str crate_meta_name,
@ -7625,7 +7624,9 @@ fn register_fn_pair(&@crate_ctxt cx, str ps, TypeRef llfnty, ValueRef llfn,
// Returns the number of type parameters that the given native function has.
fn native_fn_ty_param_count(&@crate_ctxt cx, ast::node_id id) -> uint {
auto count;
auto native_item = cx.native_items.get(id);
auto native_item = alt (cx.ast_map.get(id)) {
case (ast_map::node_native_item(?i)) { i }
};
alt (native_item.node) {
case (ast::native_item_ty(_, _)) {
cx.sess.bug("decl_native_fn_and_pair(): native fn isn't " +
@ -7668,7 +7669,9 @@ fn decl_native_fn_and_pair(&@crate_ctxt ccx, &span sp, vec[str] path,
auto lltop = bcx.llbb;
// Declare the function itself.
auto item = ccx.native_items.get(id);
auto item = alt (ccx.ast_map.get(id)) {
case (ast_map::node_native_item(?i)) { i }
};
auto fn_type = node_id_type(ccx, id); // NB: has no type params
auto abi = ty::ty_fn_abi(ccx.tcx, fn_type);
@ -7807,14 +7810,11 @@ fn collect_native_item(@crate_ctxt ccx, &@ast::native_item i, &vec[str] pt,
&vt[vec[str]] v) {
alt (i.node) {
case (ast::native_item_fn(?name, _, _, _, ?id)) {
ccx.native_items.insert(id, i);
if (!ccx.obj_methods.contains_key(id)) {
decl_native_fn_and_pair(ccx, i.span, pt, name, id);
}
}
case (ast::native_item_ty(_, ?id)) {
ccx.native_items.insert(id, i);
}
case (_) {}
}
}
@ -7830,13 +7830,8 @@ fn collect_item_1(@crate_ctxt ccx, &@ast::item i, &vec[str] pt,
llvm::LLVMSetLinkage(g,
lib::llvm::LLVMInternalLinkage as
llvm::Linkage);
ccx.items.insert(i.id, i);
ccx.consts.insert(i.id, g);
}
case (ast::item_mod(?m)) { ccx.items.insert(i.id, i); }
case (ast::item_native_mod(_)) { ccx.items.insert(i.id, i); }
case (ast::item_ty(_, _)) { ccx.items.insert(i.id, i); }
case (ast::item_tag(_, _)) { ccx.items.insert(i.id, i); }
case (_) { }
}
}
@ -7847,13 +7842,11 @@ fn collect_item_2(&@crate_ctxt ccx, &@ast::item i, &vec[str] pt,
visit::visit_item(i, new_pt, v);
alt (i.node) {
case (ast::item_fn(?f, ?tps)) {
ccx.items.insert(i.id, i);
if (!ccx.obj_methods.contains_key(i.id)) {
decl_fn_and_pair(ccx, i.span, new_pt, "fn", tps, i.id, i.id);
}
}
case (ast::item_obj(?ob, ?tps, ?ctor_id)) {
ccx.items.insert(ctor_id, i);
decl_fn_and_pair(ccx, i.span, new_pt, "obj_ctor", tps, i.id,
ctor_id);
for (@ast::method m in ob.methods) {
@ -8105,7 +8098,7 @@ fn create_crate_map(&@crate_ctxt ccx) -> ValueRef {
}
fn trans_crate(&session::session sess, &@ast::crate crate, &ty::ctxt tcx,
&str output) -> ModuleRef {
&str output, &ast_map::map amap) -> ModuleRef {
auto llmod =
llvm::LLVMModuleCreateWithNameInContext(str::buf("rust_out"),
llvm::LLVMGetGlobalContext());
@ -8132,8 +8125,7 @@ fn trans_crate(&session::session sess, &@ast::crate crate, &ty::ctxt tcx,
externs=new_str_hash[ValueRef](),
intrinsics=intrinsics,
item_ids=new_int_hash[ValueRef](),
items=new_int_hash[@ast::item](),
native_items=new_int_hash[@ast::native_item](),
ast_map=amap,
item_symbols=new_int_hash[str](),
mutable main_fn=none[ValueRef],
crate_meta_name=crate_meta_name(sess, *crate, output),