Skip to content

Commit

Permalink
Auto merge of #26336 - dotdash:raw_ptr_coercions, r=nrc
Browse files Browse the repository at this point in the history
Unlike coercing from reference to unsafe pointer, coercing between two
unsafe pointers doesn't need an AutoDerefRef, because there is no region
that regionck would need to know about.

In unoptimized libcore, this reduces the number of "auto_deref" allocas
from 174 to 4.
  • Loading branch information
bors committed Jun 18, 2015
2 parents 20d23d8 + cabd068 commit 1d33318
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 7 deletions.
19 changes: 12 additions & 7 deletions src/librustc_typeck/check/coercion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,9 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
a.repr(self.tcx()),
b.repr(self.tcx()));

let mt_a = match a.sty {
ty::TyRef(_, mt) | ty::TyRawPtr(mt) => mt,
let (is_ref, mt_a) = match a.sty {
ty::TyRef(_, mt) => (true, mt),
ty::TyRawPtr(mt) => (false, mt),
_ => {
return self.subtype(a, b);
}
Expand All @@ -418,11 +419,15 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
// Although references and unsafe ptrs have the same
// representation, we still register an AutoDerefRef so that
// regionck knows that the region for `a` must be valid here.
Ok(Some(AdjustDerefRef(AutoDerefRef {
autoderefs: 1,
autoref: Some(ty::AutoUnsafe(mutbl_b)),
unsize: None
})))
if is_ref {
Ok(Some(AdjustDerefRef(AutoDerefRef {
autoderefs: 1,
autoref: Some(ty::AutoUnsafe(mutbl_b)),
unsize: None
})))
} else {
Ok(None)
}
}
}

Expand Down
27 changes: 27 additions & 0 deletions src/test/codegen/coercions.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 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

static X: i32 = 5;

// CHECK-LABEL: @raw_ptr_to_raw_ptr_noop
// CHECK-NOT: alloca
#[no_mangle]
pub fn raw_ptr_to_raw_ptr_noop() -> *const i32{
&X as *const i32
}

// CHECK-LABEL: @reference_to_raw_ptr_noop
// CHECK-NOT: alloca
#[no_mangle]
pub fn reference_to_raw_ptr_noop() -> *const i32 {
&X
}
1 change: 1 addition & 0 deletions src/test/compile-fail/issue-16538.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ mod Y {

static foo: *const Y::X = Y::foo(Y::x as *const Y::X);
//~^ ERROR the trait `core::marker::Sync` is not implemented for the type
//~| ERROR cannot refer to other statics by value, use the address-of operator or a constant instead
//~| ERROR E0015

fn main() {}

0 comments on commit 1d33318

Please sign in to comment.