Skip to content

Commit

Permalink
Require that types cannot implement both Drop and Copy.
Browse files Browse the repository at this point in the history
Opt-in built-in traits allowed one to explicitly implement both `Drop`
and `Copy` for a type. This can theoretically make some sense, but the
current implementation means it is codegened totally incorrectly which
can lead to memory unsafety, so this feature is disabled for now.

Fixes rust-lang#20126.
  • Loading branch information
huonw committed Jan 6, 2015
1 parent c7dd3c4 commit 8ba4cfc
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 8 deletions.
26 changes: 19 additions & 7 deletions src/librustc_typeck/coherence/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,21 +387,23 @@ impl<'a, 'tcx> CoherenceChecker<'a, 'tcx> {
Some(id) => id, None => { return }
};

let impl_items = tcx.impl_items.borrow();
let trait_impls = match tcx.trait_impls.borrow().get(&drop_trait).cloned() {
None => return, // No types with (new-style) dtors present.
Some(found_impls) => found_impls
};

for &impl_did in trait_impls.borrow().iter() {
let items = &(*impl_items)[impl_did];
if items.len() < 1 {
// We'll error out later. For now, just don't ICE.
continue;
}
let method_def_id = items[0];
let method_def_id = {
let items = &tcx.impl_items.borrow()[impl_did];
if items.len() < 1 {
// We'll error out later. For now, just don't ICE.
continue;
}
items[0]
};

let self_type = self.get_self_type_for_implementation(impl_did);

match self_type.ty.sty {
ty::ty_enum(type_def_id, _) |
ty::ty_struct(type_def_id, _) |
Expand Down Expand Up @@ -434,6 +436,16 @@ impl<'a, 'tcx> CoherenceChecker<'a, 'tcx> {
}
}
}

if impl_did.krate == ast::LOCAL_CRATE {
let span = tcx.map.span(impl_did.node);
let param_env = ParameterEnvironment::for_item(tcx, impl_did.node);
if !ty::type_moves_by_default(&param_env, span, self_type.ty) {
span_err!(tcx.sess, span, E0184,
"the `Drop` trait may not be implemented on \
a type that implements `Copy`")
}
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/librustc_typeck/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,6 @@ register_diagnostics! {
E0180,
E0181,
E0182,
E0183
E0183,
E0184
}
21 changes: 21 additions & 0 deletions src/test/compile-fail/exclusive-drop-and-copy.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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.

// issue #20126

#[derive(Copy)]
struct Foo;

impl Drop for Foo {
//~^ ERROR the `Drop` trait may not be implemented on a type that implements `Copy`
fn drop(&mut self) {}
}

fn main() {}

2 comments on commit 8ba4cfc

@nikomatsakis
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@huonw it occurs to me that this check might not quite work for generic structs -- but there is some question as to the correct behavior of Drop in the case of generic structs anyhow (i.e., if you have struct Foo<T>(T), is it ok to impl<T:Bar> Drop for Foo<T>?). Right now it's a moot point because #[unsafe_dtor] is required for generic structs anyway, but eventually that will not be true.

@nikomatsakis
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+

Please sign in to comment.