Skip to content

Commit 55af8dc

Browse files
Ariel Ben-Yehudaarielb1
authored andcommitted
---
yaml --- r: 228531 b: refs/heads/try c: 8edcff5 h: refs/heads/master i: 228529: 8dfe4be 228527: 02cbe8a v: v3
1 parent bd1b129 commit 55af8dc

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 34309cdf12e752104474c8083b17615f642dac29
4+
refs/heads/try: 8edcff59d9131dfd78cf1897e861f0ee4140db10
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/common.rs

Lines changed: 6 additions & 4 deletions
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
}
Lines changed: 23 additions & 0 deletions
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)