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

Directly return loaded value from type_checked_load

Browse Source
This commit is contained in:
bjorn3 2022-12-03 18:27:43 +00:00
parent fff6296b62
commit b2e0db93e7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_codegen_llvm/src/intrinsic.rs
View File

@ -424,7 +424,9 @@ fn type_checked_load(
typeid: &'ll Value, typeid: &'ll Value,
) -> Self::Value { ) -> Self::Value {
let vtable_byte_offset = self.const_i32(vtable_byte_offset as i32); let vtable_byte_offset = self.const_i32(vtable_byte_offset as i32);
self.call_intrinsic("llvm.type.checked.load", &[llvtable, vtable_byte_offset, typeid]) let type_checked_load =
self.call_intrinsic("llvm.type.checked.load", &[llvtable, vtable_byte_offset, typeid]);
self.extract_value(type_checked_load, 0)
} }
fn va_start(&mut self, va_list: &'ll Value) -> &'ll Value { fn va_start(&mut self, va_list: &'ll Value) -> &'ll Value {

3
compiler/rustc_codegen_ssa/src/meth.rs
View File

@ -31,8 +31,7 @@ pub fn get_fn<Bx: BuilderMethods<'a, 'tcx>>(
let typeid = let typeid =
bx.typeid_metadata(typeid_for_trait_ref(bx.tcx(), expect_dyn_trait_in_self(ty))); bx.typeid_metadata(typeid_for_trait_ref(bx.tcx(), expect_dyn_trait_in_self(ty)));
let vtable_byte_offset = self.0 * bx.data_layout().pointer_size.bytes(); let vtable_byte_offset = self.0 * bx.data_layout().pointer_size.bytes();
let type_checked_load = bx.type_checked_load(llvtable, vtable_byte_offset, typeid); let func = bx.type_checked_load(llvtable, vtable_byte_offset, typeid);
let func = bx.extract_value(type_checked_load, 0);
bx.pointercast(func, llty) bx.pointercast(func, llty)
} else { } else {
let ptr_align = bx.tcx().data_layout.pointer_align.abi; let ptr_align = bx.tcx().data_layout.pointer_align.abi;