Skip to content

Commit 7012af2

Browse files
committed
---
yaml --- r: 64909 b: refs/heads/snap-stage3 c: 389aba0 h: refs/heads/master i: 64907: d0162c9 v: v3
1 parent 7fa1c1f commit 7012af2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
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: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 9e857458d6ccf236361cefe33c313bc3c31d9428
4+
refs/heads/snap-stage3: 389aba09523f805e3b493a5089c6397749b06b67
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/glue.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ pub fn simplified_glue_type(tcx: ty::ctxt, field: uint, t: ty::t) -> ty::t {
136136

137137
if field == abi::tydesc_field_take_glue {
138138
match ty::get(t).sty {
139-
ty::ty_unboxed_vec(*) => { return ty::mk_u32(); }
139+
ty::ty_unboxed_vec(*) |
140+
ty::ty_uniq(*) |
141+
ty::ty_estr(ty::vstore_uniq) |
142+
ty::ty_evec(_, ty::vstore_uniq) => { return ty::mk_u32(); }
140143
_ => ()
141144
}
142145
}

0 commit comments

Comments
 (0)