user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make vtable_allocation always succeed

Browse source
This commit is contained in:
Smitty 2021-07-03 11:14:19 -04:00
parent 17373a9401
commit 913c0bc01d
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/vtable.rs
View file

@ -72,10 +72,7 @@ pub(crate) fn get_vtable<'tcx>(
let vtable_ptr = if let Some(vtable_ptr) = fx.vtables.get(&(ty, trait_ref)) {
*vtable_ptr
} else {
let vtable_alloc_id = match fx.tcx.vtable_allocation(ty, trait_ref) {
Ok(alloc) => alloc,
Err(_) => fx.tcx.sess.fatal("allocation of constant vtable failed"),
};
let vtable_alloc_id = fx.tcx.vtable_allocation(ty, trait_ref);
let vtable_allocation = fx.tcx.global_alloc(vtable_alloc_id).unwrap_memory();
let vtable_ptr = pointer_for_allocation(fx, vtable_allocation);