File tree 2 files changed +3
-3
lines changed
branches/snap-stage3/src/rustc/middle/trans
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: e4f5f235e40c1916b14ee59e7066574d2c102725
4
+ refs/heads/snap-stage3: 80dc2e11a12c0a77447b74ef3fea3eb3ba44faaa
5
5
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
Original file line number Diff line number Diff line change @@ -554,8 +554,8 @@ fn make_opaque_cbox_take_glue(
554
554
let sz = Add ( bcx, sz, shape:: llsize_of ( ccx, T_box_header ( ccx) ) ) ;
555
555
556
556
// Allocate memory, update original ptr, and copy existing data
557
- let malloc = ccx. upcalls . shared_malloc ;
558
- let cbox_out = Call ( bcx, malloc, [ sz ] ) ;
557
+ let malloc = ccx. upcalls . exchange_malloc ;
558
+ let cbox_out = Call ( bcx, malloc, [ tydesc ] ) ;
559
559
let cbox_out = PointerCast ( bcx, cbox_out, llopaquecboxty) ;
560
560
call_memmove ( bcx, cbox_out, cbox_in, sz) ;
561
561
Store ( bcx, cbox_out, cboxptr) ;
You can’t perform that action at this time.
0 commit comments