From 913c0bc01dbab632d1512f703c026aac7acfa197 Mon Sep 17 00:00:00 2001 From: Smitty Date: Sat, 3 Jul 2021 11:14:19 -0400 Subject: [PATCH] Make vtable_allocation always succeed --- src/vtable.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vtable.rs b/src/vtable.rs index 7ee34b23e46f..12f7092d935a 100644 --- a/src/vtable.rs +++ b/src/vtable.rs @@ -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);