Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove discriminant symbols. #8546

Closed
wants to merge 1 commit into from
Closed

Remove discriminant symbols. #8546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/librustc/metadata/encoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,6 @@ fn encode_symbol(ecx: &EncodeContext,
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,
ebml_w: &mut writer::Encoder,
disr_val: uint) {
Expand Down Expand Up @@ -345,7 +337,6 @@ fn encode_enum_variant_info(ecx: &EncodeContext,
}
ast::tuple_variant_kind(_) | ast::struct_variant_kind(_) => {}
}
encode_discriminant(ecx, ebml_w, variant.node.id);
if vi[i].disr_val != disr_val {
encode_disr_val(ecx, ebml_w, vi[i].disr_val);
disr_val = vi[i].disr_val;
Expand Down
57 changes: 0 additions & 57 deletions src/librustc/middle/trans/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ use syntax::codemap::span;
use syntax::parse::token;
use syntax::parse::token::{special_idents};
use syntax::print::pprust::stmt_to_str;
use syntax::visit;
use syntax::{ast, ast_util, codemap, ast_map};
use syntax::abi::{X86, X86_64, Arm, Mips};

Expand Down Expand Up @@ -2609,57 +2608,6 @@ pub fn register_method(ccx: @mut CrateContext,
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 {
let ccx = cx.ccx();
return PtrToInt(cx, v, ccx.int_type);
Expand Down Expand Up @@ -3038,11 +2986,6 @@ pub fn trans_crate(sess: session::Session,
link_meta,
analysis.reachable);

{
let _icx = push_ctxt("data");
trans_constants(ccx, crate);
}

{
let _icx = push_ctxt("text");
trans_mod(ccx, &crate.module);
Expand Down