Skip to content

Commit c076d3c

Browse files
committed
rustc: Translate class literals correctly if the class has a destructor
1 parent 16a0f72 commit c076d3c

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/rustc/middle/trans/base.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3452,7 +3452,17 @@ fn trans_struct(block_context: block, span: span, fields: ~[ast::field],
34523452
}
34533453
}
34543454

3455-
let dest = GEPi(block_context, dest_address, ~[0, index]);
3455+
// If the class has a destructor, our GEP is a little more
3456+
// complicated.
3457+
let dest;
3458+
if ty::ty_dtor(block_context.tcx(), class_id).is_some() {
3459+
dest = GEPi(block_context,
3460+
GEPi(block_context, dest_address, ~[0, 1]),
3461+
~[0, index]);
3462+
} else {
3463+
dest = GEPi(block_context, dest_address, ~[0, index]);
3464+
}
3465+
34563466
block_context = trans_expr_save_in(block_context,
34573467
field.node.expr,
34583468
dest);

0 commit comments

Comments
 (0)