Skip to content

Commit b3ba8a5

Browse files
committed
---
yaml --- r: 4048 b: refs/heads/master c: 879b639 h: refs/heads/master v: v3
1 parent 659cfab commit b3ba8a5

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 8ebd29225379d8ab2229f411a16eae880c887b9b
2+
refs/heads/master: 879b6392d9d5b81a18f02f640e29e1898960d533

trunk/src/comp/middle/trans.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -6340,7 +6340,7 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
63406340
let ty::t typarams_ty = ty::mk_imm_tup(ccx.tcx, ~[]);
63416341

63426342
// Tuple type for body:
6343-
// [tydesc_ty, [typaram, ...], [field, ...], with_obj]
6343+
// [tydesc, [typaram, ...], [field, ...], with_obj]
63446344
let ty::t body_ty =
63456345
ty::mk_imm_tup(ccx.tcx, ~[tydesc_ty, typarams_ty,
63466346
fields_ty, with_obj_ty]);
@@ -6352,7 +6352,7 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
63526352

63536353
// mk_imm_box throws a refcount into the type we're synthesizing,
63546354
// so that it looks like:
6355-
// [rc, [tydesc_ty, [typaram, ...], [field, ...], with_obj]]
6355+
// [rc, [tydesc, [typaram, ...], [field, ...], with_obj]]
63566356
let ty::t boxed_body_ty = ty::mk_imm_box(ccx.tcx, body_ty);
63576357

63586358
// Grab onto the refcount and body parts of the box we allocated.
@@ -6374,7 +6374,6 @@ fn trans_anon_obj(@block_ctxt bcx, &span sp, &ast::anon_obj anon_obj,
63746374
// the user of the object. So the tydesc is needed to keep track of
63756375
// the types of the object's fields, so that the fields can be freed
63766376
// later.
6377-
63786377
auto body_tydesc =
63796378
GEP_tup_like(bcx, body_ty, body.val,
63806379
~[0, abi::obj_body_elt_tydesc]);
@@ -7153,7 +7152,7 @@ fn process_fwding_mthd(@local_ctxt cx, &span sp, @ty::method m,
71537152
let ty::t typarams_ty = ty::mk_imm_tup(cx.ccx.tcx, ~[]);
71547153

71557154
// Tuple type for body:
7156-
// [tydesc_ty, [typaram, ...], [field, ...], with_obj]
7155+
// [tydesc, [typaram, ...], [field, ...], with_obj]
71577156
let ty::t body_ty =
71587157
ty::mk_imm_tup(cx.ccx.tcx, ~[tydesc_ty, typarams_ty,
71597158
fields_ty, with_obj_ty]);

0 commit comments

Comments
 (0)