OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #8546 : jld/rust/discrim-symbol-rm, r=pcwalton

Browse Source 
Given that bootstrapping and running the testsuite works without
exporting discriminant values as global constants, I conclude that
they're unused and can be removed.
This commit is contained in:
bors 2013-08-21 12:51:40 -07:00
commit 18144b12b1
2 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc/metadata/encoder.rs
View File

@ -290,14 +290,6 @@ fn encode_symbol(ecx: &EncodeContext,
ebml_w.end_tag(); ebml_w.end_tag();
} }
fn encode_discriminant(ecx: &EncodeContext,
ebml_w: &mut writer::Encoder,
id: NodeId) {
ebml_w.start_tag(tag_items_data_item_symbol);
ebml_w.writer.write(ecx.discrim_symbols.get_copy(&id).as_bytes());
ebml_w.end_tag();
}
fn encode_disr_val(_: &EncodeContext, fn encode_disr_val(_: &EncodeContext,
ebml_w: &mut writer::Encoder, ebml_w: &mut writer::Encoder,
disr_val: uint) { disr_val: uint) {
@ -344,7 +336,6 @@ fn encode_enum_variant_info(ecx: &EncodeContext,
} }
ast::tuple_variant_kind(_) | ast::struct_variant_kind(_) => {} ast::tuple_variant_kind(_) | ast::struct_variant_kind(_) => {}
} }
encode_discriminant(ecx, ebml_w, variant.node.id);
if vi[i].disr_val != disr_val { if vi[i].disr_val != disr_val {
encode_disr_val(ecx, ebml_w, vi[i].disr_val); encode_disr_val(ecx, ebml_w, vi[i].disr_val);
disr_val = vi[i].disr_val; disr_val = vi[i].disr_val;

57
src/librustc/middle/trans/base.rs
View File

@ -84,7 +84,6 @@ use syntax::codemap::span;
use syntax::parse::token; use syntax::parse::token;
use syntax::parse::token::{special_idents}; use syntax::parse::token::{special_idents};
use syntax::print::pprust::stmt_to_str; use syntax::print::pprust::stmt_to_str;
use syntax::visit;
use syntax::{ast, ast_util, codemap, ast_map}; use syntax::{ast, ast_util, codemap, ast_map};
use syntax::abi::{X86, X86_64, Arm, Mips}; use syntax::abi::{X86, X86_64, Arm, Mips};
@ -2621,57 +2620,6 @@ pub fn register_method(ccx: @mut CrateContext,
llfn llfn
} }
// The constant translation pass.
pub fn trans_constant(ccx: &mut CrateContext, it: @ast::item) {
let _icx = push_ctxt("trans_constant");
match it.node {
ast::item_enum(ref enum_definition, _) => {
let vi = ty::enum_variants(ccx.tcx,
ast::def_id { crate: ast::LOCAL_CRATE,
node: it.id });
let mut i = 0;
let path = item_path(ccx, &it.id);
for variant in (*enum_definition).variants.iter() {
let p = vec::append(path.clone(), [
path_name(variant.node.name),
path_name(special_idents::descrim)
]);
let s = mangle_exported_name(ccx, p, ty::mk_int()).to_managed();
let disr_val = vi[i].disr_val;
note_unique_llvm_symbol(ccx, s);
let discrim_gvar = do s.with_c_str |buf| {
unsafe {
llvm::LLVMAddGlobal(ccx.llmod, ccx.int_type.to_ref(), buf)
}
};
unsafe {
llvm::LLVMSetInitializer(discrim_gvar, C_uint(ccx, disr_val));
llvm::LLVMSetGlobalConstant(discrim_gvar, True);
}
ccx.discrims.insert(
local_def(variant.node.id), discrim_gvar);
ccx.discrim_symbols.insert(variant.node.id, s);
i += 1;
}
}
_ => ()
}
}
struct TransConstantsVisitor { ccx: @mut CrateContext }
impl visit::Visitor<()> for TransConstantsVisitor {
fn visit_item(&mut self, i:@ast::item, _:()) {
trans_constant(self.ccx, i);
visit::walk_item(self, i, ());
}
}
pub fn trans_constants(ccx: @mut CrateContext, crate: &ast::Crate) {
let mut v = TransConstantsVisitor { ccx: ccx };
visit::walk_crate(&mut v, crate, ());
}
pub fn vp2i(cx: @mut Block, v: ValueRef) -> ValueRef { pub fn vp2i(cx: @mut Block, v: ValueRef) -> ValueRef {
let ccx = cx.ccx(); let ccx = cx.ccx();
return PtrToInt(cx, v, ccx.int_type); return PtrToInt(cx, v, ccx.int_type);
@ -3050,11 +2998,6 @@ pub fn trans_crate(sess: session::Session,
link_meta, link_meta,
analysis.reachable); analysis.reachable);
{
let _icx = push_ctxt("data");
trans_constants(ccx, crate);
}
{ {
let _icx = push_ctxt("text"); let _icx = push_ctxt("text");
trans_mod(ccx, &crate.module); trans_mod(ccx, &crate.module);