Skip to content

Commit 8edcff5

Browse files
Ariel Ben-Yehudaarielb1
Ariel Ben-Yehuda
authored andcommitted
return erased regions from fulfill_obligation
Fixes #26802.
1 parent 34309cd commit 8edcff5

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

src/librustc_trans/trans/common.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -905,11 +905,13 @@ pub fn fulfill_obligation<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
905905
let vtable = selection.map(|predicate| {
906906
fulfill_cx.register_predicate_obligation(&infcx, predicate);
907907
});
908-
let vtable = drain_fulfillment_cx_or_panic(span, &infcx, &mut fulfill_cx, &vtable);
908+
let vtable = erase_regions(tcx,
909+
&drain_fulfillment_cx_or_panic(span, &infcx, &mut fulfill_cx, &vtable)
910+
);
909911

910-
info!("Cache miss: {:?}", trait_ref);
911-
ccx.trait_cache().borrow_mut().insert(trait_ref,
912-
vtable.clone());
912+
info!("Cache miss: {:?} => {:?}", trait_ref, vtable);
913+
914+
ccx.trait_cache().borrow_mut().insert(trait_ref, vtable.clone());
913915

914916
vtable
915917
}

src/test/run-pass/issue-26802.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2015 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 Foo<'a> {
12+
fn bar<'b>(&self, x: &'b u8) -> u8 where 'a: 'b { *x+7 }
13+
}
14+
15+
pub struct FooBar;
16+
impl Foo<'static> for FooBar {}
17+
fn test(foobar: FooBar) -> Box<Foo<'static>> {
18+
Box::new(foobar)
19+
}
20+
21+
fn main() {
22+
assert_eq!(test(FooBar).bar(&4), 11);
23+
}

0 commit comments

Comments
 (0)