Skip to content

Commit c85fb19

Browse files
committed
forbid all self-referencing predicates
Fixes #38604 needs a crater run
1 parent 4f542f9 commit c85fb19

File tree

2 files changed

+38
-4
lines changed

2 files changed

+38
-4
lines changed

src/librustc/traits/object_safety.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
8282
let mut violations = vec![];
8383

8484
for def_id in traits::supertrait_def_ids(self, trait_def_id) {
85-
if self.supertraits_reference_self(def_id) {
85+
if self.predicates_reference_self(def_id, true) {
8686
violations.push(ObjectSafetyViolation::SupertraitSelf);
8787
}
8888
}
@@ -117,7 +117,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
117117
if self.trait_has_sized_self(trait_def_id) {
118118
violations.push(ObjectSafetyViolation::SizedSelf);
119119
}
120-
if self.supertraits_reference_self(trait_def_id) {
120+
if self.predicates_reference_self(trait_def_id, false) {
121121
violations.push(ObjectSafetyViolation::SupertraitSelf);
122122
}
123123

@@ -128,12 +128,20 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
128128
violations
129129
}
130130

131-
fn supertraits_reference_self(self, trait_def_id: DefId) -> bool {
131+
fn predicates_reference_self(
132+
self,
133+
trait_def_id: DefId,
134+
supertraits_only: bool) -> bool
135+
{
132136
let trait_ref = ty::Binder(ty::TraitRef {
133137
def_id: trait_def_id,
134138
substs: Substs::identity_for_item(self, trait_def_id)
135139
});
136-
let predicates = self.item_super_predicates(trait_def_id);
140+
let predicates = if supertraits_only {
141+
self.item_super_predicates(trait_def_id)
142+
} else {
143+
self.item_predicates(trait_def_id)
144+
};
137145
predicates
138146
.predicates
139147
.into_iter()

src/test/compile-fail/issue-38604.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
trait Q<T:?Sized> {}
12+
trait Foo where u32: Q<Self> {
13+
fn foo(&self);
14+
}
15+
16+
impl Q<()> for u32 {}
17+
impl Foo for () {
18+
fn foo(&self) {
19+
println!("foo!");
20+
}
21+
}
22+
23+
fn main() {
24+
let _f: Box<Foo> = //~ ERROR `Foo` cannot be made into an object
25+
Box::new(()); //~ ERROR `Foo` cannot be made into an object
26+
}

0 commit comments

Comments
 (0)