bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #13628 : alexcrichton/rust/issue-13625, r=thestinger

Browse source 
In upgrading LLVM, only rust functions had the "split-stack" attribute added.
This commit changes the addition of LLVM's "split-stack" attribute to *always*
occur and then we remove it sometimes if the "no_split_stack" rust attribute is
present.

Closes #13625
This commit is contained in:
bors 2014-04-19 10:56:25 -07:00
commit 3db2b6933d
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/librustc/lib/llvm.rs
View file

@ -709,6 +709,7 @@ pub mod llvm {
pub fn LLVMSetGC(Fn: ValueRef, Name: *c_char); pub fn LLVMSetGC(Fn: ValueRef, Name: *c_char);
pub fn LLVMAddFunctionAttr(Fn: ValueRef, PA: c_uint); pub fn LLVMAddFunctionAttr(Fn: ValueRef, PA: c_uint);
pub fn LLVMAddFunctionAttrString(Fn: ValueRef, Name: *c_char); pub fn LLVMAddFunctionAttrString(Fn: ValueRef, Name: *c_char);
pub fn LLVMRemoveFunctionAttrString(Fn: ValueRef, Name: *c_char);
pub fn LLVMGetFunctionAttr(Fn: ValueRef) -> c_ulonglong; pub fn LLVMGetFunctionAttr(Fn: ValueRef) -> c_ulonglong;
pub fn LLVMAddReturnAttribute(Fn: ValueRef, PA: c_uint); pub fn LLVMAddReturnAttribute(Fn: ValueRef, PA: c_uint);

11
src/librustc/middle/trans/base.rs
View file

@ -199,6 +199,7 @@ fn decl_fn(llmod: ModuleRef, name: &str, cc: lib::llvm::CallConv,
lib::llvm::SetFunctionCallConv(llfn, cc); lib::llvm::SetFunctionCallConv(llfn, cc);
// Function addresses in Rust are never significant, allowing functions to be merged. // Function addresses in Rust are never significant, allowing functions to be merged.
lib::llvm::SetUnnamedAddr(llfn, true); lib::llvm::SetUnnamedAddr(llfn, true);
set_split_stack(llfn);
llfn llfn
} }
@ -445,8 +446,8 @@ pub fn set_llvm_fn_attrs(attrs: &[ast::Attribute], llfn: ValueRef) {
} }
// Add the no-split-stack attribute if requested // Add the no-split-stack attribute if requested
if !contains_name(attrs, "no_split_stack") { if contains_name(attrs, "no_split_stack") {
set_split_stack(llfn); unset_split_stack(llfn);
} }
if contains_name(attrs, "cold") { if contains_name(attrs, "cold") {
@ -464,6 +465,12 @@ pub fn set_split_stack(f: ValueRef) {
}) })
} }
pub fn unset_split_stack(f: ValueRef) {
"split-stack".with_c_str(|buf| {
unsafe { llvm::LLVMRemoveFunctionAttrString(f, buf); }
})
}
// Double-check that we never ask LLVM to declare the same symbol twice. It // Double-check that we never ask LLVM to declare the same symbol twice. It
// silently mangles such symbols, breaking our linkage model. // silently mangles such symbols, breaking our linkage model.
pub fn note_unique_llvm_symbol(ccx: &CrateContext, sym: ~str) { pub fn note_unique_llvm_symbol(ccx: &CrateContext, sym: ~str) {

12
src/rustllvm/RustWrapper.cpp
View file

@ -77,6 +77,18 @@ extern "C" void LLVMAddFunctionAttrString(LLVMValueRef fn, const char *Name) {
unwrap<Function>(fn)->addFnAttr(Name); unwrap<Function>(fn)->addFnAttr(Name);
} }
extern "C" void LLVMRemoveFunctionAttrString(LLVMValueRef fn, const char *Name) {
Function *f = unwrap<Function>(fn);
LLVMContext &C = f->getContext();
AttrBuilder B;
B.addAttribute(Name);
AttributeSet to_remove = AttributeSet::get(C, AttributeSet::FunctionIndex, B);
AttributeSet attrs = f->getAttributes();
f->setAttributes(attrs.removeAttributes(f->getContext(),
AttributeSet::FunctionIndex,
to_remove));
}
extern "C" void LLVMAddReturnAttribute(LLVMValueRef Fn, LLVMAttribute PA) { extern "C" void LLVMAddReturnAttribute(LLVMValueRef Fn, LLVMAttribute PA) {
Function *A = unwrap<Function>(Fn); Function *A = unwrap<Function>(Fn);