mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consistently use VTable over Vtable (matching stable stdlib API RawWakerVTable)

Browse Source
This commit is contained in:
Ralf Jung 2022-07-19 19:57:44 -04:00
parent 8f290184d2
commit 3f24eb870d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.rs
View File

@ -185,7 +185,7 @@ fn scalar_to_backend(&self, cv: Scalar, layout: abi::Scalar, ty: Type<'gcc>) ->
let (alloc_id, offset) = ptr.into_parts(); let (alloc_id, offset) = ptr.into_parts();
// For vtables, get the underlying data allocation. // For vtables, get the underlying data allocation.
let alloc_id = match self.tcx.global_alloc(alloc_id) { let alloc_id = match self.tcx.global_alloc(alloc_id) {
GlobalAlloc::Vtable(ty, trait_ref) => { GlobalAlloc::VTable(ty, trait_ref) => {
self.tcx.vtable_allocation((ty, trait_ref)) self.tcx.vtable_allocation((ty, trait_ref))
} }
_ => alloc_id, _ => alloc_id,
@ -208,7 +208,7 @@ fn scalar_to_backend(&self, cv: Scalar, layout: abi::Scalar, ty: Type<'gcc>) ->
GlobalAlloc::Function(fn_instance) => { GlobalAlloc::Function(fn_instance) => {
self.get_fn_addr(fn_instance) self.get_fn_addr(fn_instance)
}, },
GlobalAlloc::Vtable(..) => panic!("vtables are already handled"), GlobalAlloc::VTable(..) => panic!("vtables are already handled"),
GlobalAlloc::Static(def_id) => { GlobalAlloc::Static(def_id) => {
assert!(self.tcx.is_static(def_id)); assert!(self.tcx.is_static(def_id));
self.get_static(def_id).get_address(None) self.get_static(def_id).get_address(None)