diff options
| -rw-r--r-- | src/librustc/middle/trans/base.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 68d8ab3f04c..fcdcb7847cb 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -2140,7 +2140,10 @@ pub fn get_fn_llvm_attributes(ccx: &CrateContext, fn_ty: ty::t) attrs.push((idx, llvm::NonNullAttribute as u64)); } // `&mut` pointer parameters never alias other parameters, or mutable global data - ty::ty_rptr(b, mt) if mt.mutbl == ast::MutMutable => { + // `&` pointer parameters never alias either (for LLVM's purposes) as long as the + // interior is safe + ty::ty_rptr(b, mt) if mt.mutbl == ast::MutMutable || + !ty::type_contents(ccx.tcx(), mt.ty).interior_unsafe() => { attrs.push((idx, llvm::NoAliasAttribute as u64)); attrs.push((idx, llvm::NonNullAttribute as u64)); match b { |