rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Unbreak old-style boxed traits

Browse Source
This commit is contained in:
Patrick Walton
2012-10-03 17:18:24 -07:00
parent b34327be0d
commit f885205b1b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rustc/middle/trans/base.rs
View File

@@ -2348,7 +2348,7 @@ fn trap(bcx: block) {
fn push_rtcall(ccx: @crate_ctxt, name: ~str, did: ast::def_id) { fn push_rtcall(ccx: @crate_ctxt, name: ~str, did: ast::def_id) {
if ccx.rtcalls.contains_key(name) { if ccx.rtcalls.contains_key(name) {
fail fmt!("multiple definitions for runtime call %s", name); ccx.sess.bug(fmt!("multiple definitions for runtime call %s", name));
} }
ccx.rtcalls.insert(name, did); ccx.rtcalls.insert(name, did);
} }

7
src/rustc/middle/trans/meth.rs
View File

@@ -550,9 +550,6 @@ fn trans_trait_cast(bcx: block,
let v_ty = expr_ty(bcx, val); let v_ty = expr_ty(bcx, val);
let mut llboxdest = GEPi(bcx, lldest, [0u, 1u]); let mut llboxdest = GEPi(bcx, lldest, [0u, 1u]);
llboxdest = PointerCast(bcx, llboxdest,
T_ptr(type_of::type_of(bcx.ccx(), v_ty)));
if bcx.tcx().legacy_boxed_traits.contains_key(id) { if bcx.tcx().legacy_boxed_traits.contains_key(id) {
// Allocate an @ box and store the value into it // Allocate an @ box and store the value into it
let {bcx: new_bcx, box: llbox, body: body} = malloc_boxed(bcx, v_ty); let {bcx: new_bcx, box: llbox, body: body} = malloc_boxed(bcx, v_ty);
@@ -562,9 +559,11 @@ fn trans_trait_cast(bcx: block,
revoke_clean(bcx, llbox); revoke_clean(bcx, llbox);
// Store the @ box into the pair // Store the @ box into the pair
Store(bcx, llbox, llboxdest); Store(bcx, llbox, PointerCast(bcx, llboxdest, T_ptr(val_ty(llbox))));
} else { } else {
// Just store the @ box into the pair. // Just store the @ box into the pair.
llboxdest = PointerCast(bcx, llboxdest,
T_ptr(type_of::type_of(bcx.ccx(), v_ty)));
bcx = expr::trans_into(bcx, val, SaveIn(llboxdest)); bcx = expr::trans_into(bcx, val, SaveIn(llboxdest));
} }