Skip to content

Commit d61de11

Browse files
committed
---
yaml --- r: 46813 b: refs/heads/auto c: c0f6909 h: refs/heads/master i: 46811: 3fe772f v: v3
1 parent 873bb1e commit d61de11

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 68b3f0d8a419c94eaead13517cd87aaf5fc74b86
17+
refs/heads/auto: c0f6909f7ecee906ea21c9bbba903e105bb7e711

branches/auto/src/librustc/middle/trans/base.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,10 @@ pub fn iter_structural_ty(cx: block, av: ValueRef, t: ty::t,
676676
let mut cx = cx;
677677
match /*bad*/copy ty::get(t).sty {
678678
ty::ty_rec(*) | ty::ty_struct(*) => {
679-
do expr::with_field_tys(cx.tcx(), t, None) |_has_dtor, field_tys| {
679+
let repr = adt::represent_type(cx.ccx(), t);
680+
do expr::with_field_tys(cx.tcx(), t, None) |discr, field_tys| {
680681
for vec::eachi(field_tys) |i, field_ty| {
681-
let llfld_a = GEPi(cx, av, struct_field(i));
682+
let llfld_a = adt::trans_GEP(cx, &repr, av, discr, i);
682683
cx = f(cx, llfld_a, field_ty.mt.ty);
683684
}
684685
}

0 commit comments

Comments
 (0)