diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index e88080accaa4..0493f9c8bff8 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -248,6 +248,17 @@ pub fn decl_rust_fn(ccx: &mut CrateContext, inputs: &[ty::t], output: ty::t, } } + // The out pointer will never alias with any other pointers, as the object only exists at a + // language level after the call. It can also be tagged with SRet to indicate that it is + // guaranteed to point to a usable block of memory for the type. + if uses_outptr { + unsafe { + let outptr = llvm::LLVMGetParam(llfn, 0); + llvm::LLVMAddAttribute(outptr, lib::llvm::StructRetAttribute as c_uint); + llvm::LLVMAddAttribute(outptr, lib::llvm::NoAliasAttribute as c_uint); + } + } + llfn } diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs index 45da026afd06..d55589cb7e8b 100644 --- a/src/librustc/middle/trans/callee.rs +++ b/src/librustc/middle/trans/callee.rs @@ -20,7 +20,7 @@ use back::abi; use driver::session; -use lib::llvm::ValueRef; +use lib::llvm::{ValueRef, NoAliasAttribute, StructRetAttribute}; use lib::llvm::llvm; use metadata::csearch; use middle::trans::base; @@ -707,7 +707,21 @@ pub fn trans_call_inner(in_cx: @mut Block, } // Invoke the actual rust fn and update bcx/llresult. - let (llret, b) = base::invoke(bcx, llfn, llargs, []); + let mut attrs = ~[]; + if type_of::return_uses_outptr(in_cx.tcx(), ret_ty) { + attrs.push((1, StructRetAttribute)); + } + + match ty::get(ret_ty).sty { + // `~` pointer return values never alias because ownership is transferred + ty::ty_uniq(*) | + ty::ty_evec(_, ty::vstore_uniq) => { + attrs.push((0, NoAliasAttribute)); + } + _ => () + } + + let (llret, b) = base::invoke(bcx, llfn, llargs, attrs); bcx = b; llresult = llret; diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index cfed6e883c82..3836bd5c47c7 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -497,7 +497,7 @@ unsafe fn build_wrap_fn(ccx: @mut CrateContext, // Rust expects to use an outpointer. If the foreign fn // also uses an outpointer, we can reuse it, but the types // may vary, so cast first to the Rust type. If the - // foriegn fn does NOT use an outpointer, we will have to + // foreign fn does NOT use an outpointer, we will have to // alloca some scratch space on the stack. match foreign_outptr { Some(llforeign_outptr) => {