From bdcc02360f34fe773c38f8ae86111fb831f8ec9e Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Thu, 26 Dec 2019 10:54:24 -0500
Subject: [PATCH] Mark cleanup cold

---
 src/libstd/panicking.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index f71849fae34..3dd1f09e076 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -307,6 +307,11 @@ union Data<F, R> {
         Err(cleanup(payload.assume_init()))
     };
 
+    // We consider unwinding to be rare, so mark this function as cold. However,
+    // do not mark it no-inline -- that decision is best to leave to the
+    // optimizer (in most cases this function is not inlined even as a normal,
+    // non-cold function, though, as of the writing of this comment).
+    #[cold]
     unsafe fn cleanup(mut payload: Payload) -> Box<dyn Any + Send + 'static> {
         let obj = crate::mem::transmute(__rust_panic_cleanup(&mut payload as *mut _ as *mut u8));
         update_panic_count(-1);
-- 
2.44.0