Auto merge of #46253 - eddyb:return-aliasing, r=nagisa

rustc_trans: don't apply noalias on returned references.

In #45225 frozen returned `&T` were accidentally maked `noalias`, unlike `&mut T`.
Return value `noalias` is only sound for functions that return dynamic allocations, e.g. `Box`, and using it on anything else can lead to miscompilation, as LLVM assumes certain usage patterns.
Fixes #46239.
This commit is contained in:
bors 2017-11-26 16:38:36 +00:00
commit 71b21ed0da
3 changed files with 25 additions and 1 deletions

View file

@ -792,7 +792,8 @@ impl<'a, 'tcx> FnType<'tcx> {
// dependencies rather than pointer equality
let no_alias = match kind {
PointerKind::Shared => false,
PointerKind::Frozen | PointerKind::UniqueOwned => true,
PointerKind::UniqueOwned => true,
PointerKind::Frozen |
PointerKind::UniqueBorrowed => !is_return
};
if no_alias {

View file

@ -0,0 +1,5 @@
-include ../tools.mk
all:
$(RUSTC) main.rs -C opt-level=1
$(call RUN,main)

View file

@ -0,0 +1,18 @@
// Copyright 2017 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.
fn project<T>(x: &(T,)) -> &T { &x.0 }
fn dummy() {}
fn main() {
let f = (dummy as fn(),);
(*project(&f))();
}