about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-08-14 00:56:53 +0000
committerbors <bors@rust-lang.org>2024-08-14 00:56:53 +0000
commit1bdeb98734d47eaca9fb2dbfa712d14487fe7b1e (patch)
treed34597be34abbc679db07e89d34bcfe107adb344 /src
parent52b5ccb62f915c56bdc9aae37370e95e3809ba55 (diff)
parente8ade24e14616a79add6d7d37e555b5d34f40e78 (diff)
downloadrust-1bdeb98734d47eaca9fb2dbfa712d14487fe7b1e.tar.gz
rust-1bdeb98734d47eaca9fb2dbfa712d14487fe7b1e.zip
Auto merge of #128812 - nnethercote:shrink-TyKind-FnPtr, r=compiler-errors
Shrink `TyKind::FnPtr`.

By splitting the `FnSig` within `TyKind::FnPtr` into `FnSigTys` and `FnHeader`, which can be packed more efficiently. This reduces the size of the hot `TyKind` type from 32 bytes to 24 bytes on 64-bit platforms. This reduces peak memory usage by a few percent on some benchmarks. It also reduces cache misses and page faults similarly, though this doesn't translate to clear cycles or wall-time improvements on CI.

r? `@compiler-errors`
Diffstat (limited to 'src')
-rw-r--r--src/type_of.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/type_of.rs b/src/type_of.rs
index d85ed4f12ff..b7b1be5369c 100644
--- a/src/type_of.rs
+++ b/src/type_of.rs
@@ -213,9 +213,8 @@ impl<'tcx> LayoutGccExt<'tcx> for TyAndLayout<'tcx> {
                 // NOTE: we cannot remove this match like in the LLVM codegen because the call
                 // to fn_ptr_backend_type handle the on-stack attribute.
                 // TODO(antoyo): find a less hackish way to hande the on-stack attribute.
-                ty::FnPtr(sig) => {
-                    cx.fn_ptr_backend_type(cx.fn_abi_of_fn_ptr(sig, ty::List::empty()))
-                }
+                ty::FnPtr(sig_tys, hdr) => cx
+                    .fn_ptr_backend_type(cx.fn_abi_of_fn_ptr(sig_tys.with(hdr), ty::List::empty())),
                 _ => self.scalar_gcc_type_at(cx, scalar, Size::ZERO),
             };
             cx.scalar_types.borrow_mut().insert(self.ty, ty);