Skip to content

Don't call drop when taking the address of unsized fields #25595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/librustc_trans/trans/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -730,8 +730,9 @@ fn trans_field<'blk, 'tcx, F>(bcx: Block<'blk, 'tcx>,
let info = Load(bcx, get_len(bcx, base_datum.val));
Store(bcx, info, get_len(bcx, scratch.val));

DatumBlock::new(bcx, scratch.to_expr_datum())

// Always generate an lvalue datum, because this pointer doesn't own
// the data and cleanup is scheduled elsewhere.
DatumBlock::new(bcx, Datum::new(scratch.val, scratch.ty, LvalueExpr))
}
})

Expand Down
29 changes: 29 additions & 0 deletions src/test/run-pass/issue-25515.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// 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.

use std::rc::Rc;

struct Foo<'r>(&'r mut i32);

impl<'r> Drop for Foo<'r> {
fn drop(&mut self) {
*self.0 += 1;
}
}

fn main() {
let mut drops = 0;

{
let _: Rc<Send> = Rc::new(Foo(&mut drops));
}

assert_eq!(1, drops);
}
41 changes: 41 additions & 0 deletions src/test/run-pass/issue-25549-multiple-drop.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// 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.

struct Foo<'r>(&'r mut i32);

impl<'r> Drop for Foo<'r> {
fn drop(&mut self) {
*self.0 += 1;
}
}

trait Trait {}
impl<'r> Trait for Foo<'r> {}

struct Holder<T: ?Sized>(T);

fn main() {
let mut drops = 0;

{
let y = &Holder([Foo(&mut drops)]) as &Holder<[Foo]>;
// this used to cause an extra drop of the Foo instance
let x = &y.0;
}
assert_eq!(1, drops);

drops = 0;
{
let y = &Holder(Foo(&mut drops)) as &Holder<Trait>;
// this used to cause an extra drop of the Foo instance
let x = &y.0;
}
assert_eq!(1, drops);
}