Set metadata for vtable-related loads

Give LLVM much more information about vtable pointers. Without the extra
information, LLVM has to be rather pessimistic about vtables, preventing
a number of obvious optimisations.

* Makes the vtable pointer argument noalias and readonly.
* Marks loads of the vtable pointer as nonnull.
* Marks load from the vtable with `!invariant.load` metadata.

Fixes #39992
This commit is contained in:
James Miller 2017-02-21 21:08:06 +13:00
parent a17e5e2949
commit 7af3406a49
5 changed files with 34 additions and 6 deletions

View File

@ -506,7 +506,11 @@ impl FnType {
if let Some(inner) = rust_ptr_attrs(ty, &mut data) { if let Some(inner) = rust_ptr_attrs(ty, &mut data) {
data.attrs.set(ArgAttribute::NonNull); data.attrs.set(ArgAttribute::NonNull);
if ccx.tcx().struct_tail(inner).is_trait() { if ccx.tcx().struct_tail(inner).is_trait() {
// vtables can be safely marked non-null, readonly
// and noalias.
info.attrs.set(ArgAttribute::NonNull); info.attrs.set(ArgAttribute::NonNull);
info.attrs.set(ArgAttribute::ReadOnly);
info.attrs.set(ArgAttribute::NoAlias);
} }
} }
args.push(data); args.push(data);

View File

@ -472,8 +472,15 @@ pub fn load_fat_ptr<'a, 'tcx>(
b.load(ptr, alignment.to_align()) b.load(ptr, alignment.to_align())
}; };
// FIXME: emit metadata on `meta`. let meta = get_meta(b, src);
let meta = b.load(get_meta(b, src), alignment.to_align()); let meta_ty = val_ty(meta);
// If the 'meta' field is a pointer, it's a vtable, so use load_nonnull
// instead
let meta = if meta_ty.element_type().kind() == llvm::TypeKind::Pointer {
b.load_nonnull(meta, None)
} else {
b.load(meta, None)
};
(ptr, meta) (ptr, meta)
} }

View File

@ -1149,6 +1149,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
} }
} }
pub fn set_invariant_load(&self, load: ValueRef) {
unsafe {
llvm::LLVMSetMetadata(load, llvm::MD_invariant_load as c_uint,
llvm::LLVMMDNodeInContext(self.ccx.llcx(), ptr::null(), 0));
}
}
/// Returns the ptr value that should be used for storing `val`. /// Returns the ptr value that should be used for storing `val`.
fn check_store<'b>(&self, fn check_store<'b>(&self,
val: ValueRef, val: ValueRef,

View File

@ -386,7 +386,15 @@ pub fn size_and_align_of_dst<'a, 'tcx>(bcx: &Builder<'a, 'tcx>, t: Ty<'tcx>, inf
let info = bcx.pointercast(info, Type::int(bcx.ccx).ptr_to()); let info = bcx.pointercast(info, Type::int(bcx.ccx).ptr_to());
let size_ptr = bcx.gepi(info, &[1]); let size_ptr = bcx.gepi(info, &[1]);
let align_ptr = bcx.gepi(info, &[2]); let align_ptr = bcx.gepi(info, &[2]);
(bcx.load(size_ptr, None), bcx.load(align_ptr, None))
let size = bcx.load(size_ptr, None);
let align = bcx.load(align_ptr, None);
// Vtable loads are invariant
bcx.set_invariant_load(size);
bcx.set_invariant_load(align);
(size, align)
} }
ty::TySlice(_) | ty::TyStr => { ty::TySlice(_) | ty::TyStr => {
let unit_ty = t.sequence_element_type(bcx.tcx()); let unit_ty = t.sequence_element_type(bcx.tcx());

View File

@ -30,13 +30,15 @@ const VTABLE_OFFSET: usize = 3;
/// Extracts a method from a trait object's vtable, at the specified index. /// Extracts a method from a trait object's vtable, at the specified index.
pub fn get_virtual_method<'a, 'tcx>(bcx: &Builder<'a, 'tcx>, pub fn get_virtual_method<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,
llvtable: ValueRef, llvtable: ValueRef,
vtable_index: usize) vtable_index: usize) -> ValueRef {
-> ValueRef {
// Load the data pointer from the object. // Load the data pointer from the object.
debug!("get_virtual_method(vtable_index={}, llvtable={:?})", debug!("get_virtual_method(vtable_index={}, llvtable={:?})",
vtable_index, Value(llvtable)); vtable_index, Value(llvtable));
bcx.load(bcx.gepi(llvtable, &[vtable_index + VTABLE_OFFSET]), None) let ptr = bcx.load_nonnull(bcx.gepi(llvtable, &[vtable_index + VTABLE_OFFSET]), None);
// Vtable loads are invariant
bcx.set_invariant_load(ptr);
ptr
} }
/// Generate a shim function that allows an object type like `SomeTrait` to /// Generate a shim function that allows an object type like `SomeTrait` to