parent
4e5d5ba1ed
commit
ab3999f615
|
@ -816,7 +816,7 @@ pub fn trans_call_inner<'a>(
|
|||
|
||||
// The code below invokes the function, using either the Rust
|
||||
// conventions (if it is a rust fn) or the native conventions
|
||||
// (otherwise). The important part is that, when all is sad
|
||||
// (otherwise). The important part is that, when all is said
|
||||
// and done, either the return value of the function will have been
|
||||
// written in opt_llretslot (if it is Some) or `llresult` will be
|
||||
// set appropriately (otherwise).
|
||||
|
|
|
@ -2045,10 +2045,13 @@ fn deref_once<'a>(bcx: &'a Block<'a>,
|
|||
typeck::AutoDeref(_) => unpack_datum!(bcx, auto_ref(bcx, datum, expr)),
|
||||
_ => datum
|
||||
};
|
||||
let val = unpack_result!(bcx, trans_overloaded_op(bcx, expr, method_call,
|
||||
datum, None, None));
|
||||
|
||||
let ref_ty = ty::ty_fn_ret(monomorphize_type(bcx, method_ty));
|
||||
Datum::new(val, ref_ty, RvalueExpr(Rvalue::new(ByValue)))
|
||||
let scratch = rvalue_scratch_datum(bcx, ref_ty, "overloaded_deref");
|
||||
|
||||
unpack_result!(bcx, trans_overloaded_op(bcx, expr, method_call,
|
||||
datum, None, Some(SaveIn(scratch.val))));
|
||||
scratch.to_expr_datum()
|
||||
}
|
||||
None => {
|
||||
// Not overloaded. We already have a pointer we know how to deref.
|
||||
|
|
|
@ -0,0 +1,40 @@
|
|||
// Copyright 2014 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.
|
||||
|
||||
// Test that a custom deref with a fat pointer return type does not ICE
|
||||
|
||||
pub struct Arr {
|
||||
ptr: Box<[uint]>
|
||||
}
|
||||
|
||||
impl Deref<[uint]> for Arr {
|
||||
fn deref(&self) -> &[uint] {
|
||||
fail!();
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut<[uint]> for Arr {
|
||||
fn deref_mut(&mut self) -> &mut [uint] {
|
||||
&mut *self.ptr
|
||||
}
|
||||
}
|
||||
|
||||
pub fn foo(arr: &mut Arr) {
|
||||
assert!(arr.len() == 3);
|
||||
let x: &mut [uint] = &mut **arr;
|
||||
assert!(x[0] == 1);
|
||||
assert!(x[1] == 2);
|
||||
assert!(x[2] == 3);
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let mut a = Arr { ptr: box [1, 2, 3] };
|
||||
foo(&mut a);
|
||||
}
|
|
@ -0,0 +1,34 @@
|
|||
// Copyright 2014 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.
|
||||
|
||||
// Test that a custom deref with a fat pointer return type does not ICE
|
||||
|
||||
pub struct Arr {
|
||||
ptr: Box<[uint]>
|
||||
}
|
||||
|
||||
impl Deref<[uint]> for Arr {
|
||||
fn deref(&self) -> &[uint] {
|
||||
&*self.ptr
|
||||
}
|
||||
}
|
||||
|
||||
pub fn foo(arr: &Arr) {
|
||||
assert!(arr.len() == 3);
|
||||
let x: &[uint] = &**arr;
|
||||
assert!(x[0] == 1);
|
||||
assert!(x[1] == 2);
|
||||
assert!(x[2] == 3);
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let a = Arr { ptr: box [1, 2, 3] };
|
||||
foo(&a);
|
||||
}
|
Loading…
Reference in New Issue