Skip to content

Commit

Permalink
Fix link_section regression.
Browse files Browse the repository at this point in the history
Fixes #27467.
  • Loading branch information
eefriedman committed Aug 4, 2015
1 parent a8b7146 commit c40703f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 15 deletions.
34 changes: 19 additions & 15 deletions src/librustc_trans/trans/base.rs
Expand Up @@ -2032,6 +2032,23 @@ pub fn update_linkage(ccx: &CrateContext,
}
}

fn set_global_section(ccx: &CrateContext, llval: ValueRef, i: &ast::Item) {
match attr::first_attr_value_str_by_name(&i.attrs,
"link_section") {
Some(sect) => {
if contains_null(&sect) {
ccx.sess().fatal(&format!("Illegal null byte in link_section value: `{}`",
&sect));
}
unsafe {
let buf = CString::new(sect.as_bytes()).unwrap();
llvm::LLVMSetSection(llval, buf.as_ptr());
}
},
None => ()
}
}

pub fn trans_item(ccx: &CrateContext, item: &ast::Item) {
let _icx = push_ctxt("trans_item");

Expand All @@ -2054,6 +2071,7 @@ pub fn trans_item(ccx: &CrateContext, item: &ast::Item) {
} else {
trans_fn(ccx, &**decl, &**body, llfn, empty_substs, item.id, &item.attrs);
}
set_global_section(ccx, llfn, item);
update_linkage(ccx, llfn, Some(item.id),
if is_origin { OriginalTranslation } else { InlinedCopy });

Expand Down Expand Up @@ -2103,6 +2121,7 @@ pub fn trans_item(ccx: &CrateContext, item: &ast::Item) {
v.visit_expr(&**expr);

let g = consts::trans_static(ccx, m, expr, item.id, &item.attrs);
set_global_section(ccx, g, item);
update_linkage(ccx, g, Some(item.id), OriginalTranslation);
},
ast::ItemForeignMod(ref foreign_mod) => {
Expand Down Expand Up @@ -2381,21 +2400,6 @@ pub fn get_item_val(ccx: &CrateContext, id: ast::NodeId) -> ValueRef {
_ => ccx.sess().bug("get_item_val: weird result in table")
};

match attr::first_attr_value_str_by_name(&i.attrs,
"link_section") {
Some(sect) => {
if contains_null(&sect) {
ccx.sess().fatal(&format!("Illegal null byte in link_section value: `{}`",
&sect));
}
unsafe {
let buf = CString::new(sect.as_bytes()).unwrap();
llvm::LLVMSetSection(v, buf.as_ptr());
}
},
None => ()
}

v
}

Expand Down
36 changes: 36 additions & 0 deletions src/test/codegen/link_section.rs
@@ -0,0 +1,36 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags: -C no-prepopulate-passes

// CHECK: @VAR1 = constant i32 1, section ".test_one"
#[no_mangle]
#[link_section = ".test_one"]
pub static VAR1: u32 = 1;

pub enum E {
A(u32),
B(f32)
}

// CHECK: @VAR2 = constant {{.*}} { i32 0, i32 666, {{.*}} }, section ".test_two"
#[no_mangle]
#[link_section = ".test_two"]
pub static VAR2: E = E::A(666);

// CHECK: @VAR3 = constant {{.*}} { i32 1, float 1.000000e+00, {{.*}} }, section ".test_three"
#[no_mangle]
#[link_section = ".test_three"]
pub static VAR3: E = E::B(1.);

// CHECK: define void @fn1() {{.*}} section ".test_four" {
#[no_mangle]
#[link_section = ".test_four"]
pub fn fn1() {}

0 comments on commit c40703f

Please sign in to comment.