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

Skip collecting no-op DropGlue in vtables

Browse source 
Since 122662 this no longer gets used in vtables, so we're safe to fully
drop generating these empty functions. Those are eventually cleaned up
by LLVM, but it's wasteful to produce them in the first place.

This also adds a missing test for fn-ptr casts, which do still need to
generate no-op drop glue. It's possible a future optimization could
point all of those at the same drop glue (e.g., for *mut ()) rather than
for each separate type, but that would require extra work for CFI and
isn't particularly easy to do anyway.
This commit is contained in:
Mark Rousskov 2025-06-14 10:22:49 -04:00
parent d4e1159b8c
commit 1f40573507
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_monomorphize/src/collector.rs
View file

@ -949,6 +949,9 @@ fn visit_instance_use<'tcx>(
}
ty::InstanceKind::DropGlue(_, None) => {
// Don't need to emit noop drop glue if we are calling directly.
//
// Note that we also optimize away the call to visit_instance_use in vtable construction
// (see create_mono_items_for_vtable_methods).
if !is_direct_call {
output.push(create_fn_mono_item(tcx, instance, source));
}
@ -1177,8 +1180,13 @@ fn create_mono_items_for_vtable_methods<'tcx>(
output.extend(methods);
}
// Also add the destructor.
visit_drop_use(tcx, impl_ty, false, source, output);
// Also add the destructor, if it's necessary.
//
// This matches the check in vtable_allocation_provider in middle/ty/vtable.rs,
// if we don't need drop we're not adding an actual pointer to the vtable.
if impl_ty.needs_drop(tcx, ty::TypingEnv::fully_monomorphized()) {
visit_drop_use(tcx, impl_ty, false, source, output);
}
}
/// Scans the CTFE alloc in order to find function pointers and statics that must be monomorphized.

23
tests/codegen-units/item-collection/drop-glue-noop.rs Normal file
View file

@ -0,0 +1,23 @@
//@ compile-flags:-Clink-dead-code -Zmir-opt-level=0
#![deny(dead_code)]
#![crate_type = "lib"]
//~ MONO_ITEM fn start
#[no_mangle]
pub fn start(_: isize, _: *const *const u8) -> isize {
// No item produced for this, it's a no-op drop and so is removed.
unsafe {
std::ptr::drop_in_place::<u32>(&mut 0);
}
// No choice but to codegen for indirect drop as a function pointer, since we have to produce a
// function with the right signature. In vtables we can avoid that (tested in
// instantiation-through-vtable.rs) because we special case null pointer for drop glue since
// #122662.
//
//~ MONO_ITEM fn std::ptr::drop_in_place::<u64> - shim(None) @@ drop_glue_noop-cgu.0[External]
std::ptr::drop_in_place::<u64> as unsafe fn(*mut u64);
0
}