From ecf83ecc3af57b20080c0706d72484eaefdd377a Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Sun, 17 Oct 2021 06:25:04 +0900
Subject: [PATCH] __del__ failure is a cold function

---
 vm/src/pyobjectrc.rs | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/vm/src/pyobjectrc.rs b/vm/src/pyobjectrc.rs
index 952f3ecc2..25bec3e4b 100644
--- a/vm/src/pyobjectrc.rs
+++ b/vm/src/pyobjectrc.rs
@@ -3,7 +3,7 @@ use crate::common::{
     rc::{PyRc, PyWeak},
 };
 use crate::{
-    builtins::{PyDictRef, PyTypeRef},
+    builtins::{PyBaseExceptionRef, PyDictRef, PyTypeRef},
     IdProtocol, PyObjectPayload, TypeProtocol, VirtualMachine,
 };
 use std::any::TypeId;
@@ -353,22 +353,7 @@ impl Drop for PyObjectRef {
         if let Some(del_slot) = self.class().mro_find_map(|cls| cls.slots.del.load()) {
             let ret = crate::vm::thread::with_vm(&zelf, |vm| {
                 if let Err(e) = del_slot(&zelf, vm) {
-                    // exception in del will be ignored but printed
-                    print!("Exception ignored in: ",);
-                    let del_method = zelf.get_class_attr("__del__").unwrap();
-                    let repr = vm.to_repr(&del_method);
-                    match repr {
-                        Ok(v) => println!("{}", v.to_string()),
-                        Err(_) => println!("{}", del_method.class().name()),
-                    }
-                    let tb_module = vm.import("traceback", None, 0).unwrap();
-                    // TODO: set exc traceback
-                    let print_stack = vm.get_attribute(tb_module, "print_stack").unwrap();
-                    vm.invoke(&print_stack, ()).unwrap();
-
-                    if let Ok(repr) = vm.to_repr(e.as_object()) {
-                        println!("{}", repr.as_str());
-                    }
+                    print_del_error(e, &zelf, vm);
                 }
             });
             if ret.is_none() {
@@ -381,6 +366,26 @@ impl Drop for PyObjectRef {
     }
 }
 
+#[cold]
+fn print_del_error(e: PyBaseExceptionRef, zelf: &PyObjectRef, vm: &VirtualMachine) {
+    // exception in del will be ignored but printed
+    print!("Exception ignored in: ",);
+    let del_method = zelf.get_class_attr("__del__").unwrap();
+    let repr = vm.to_repr(&del_method);
+    match repr {
+        Ok(v) => println!("{}", v.to_string()),
+        Err(_) => println!("{}", del_method.class().name()),
+    }
+    let tb_module = vm.import("traceback", None, 0).unwrap();
+    // TODO: set exc traceback
+    let print_stack = vm.get_attribute(tb_module, "print_stack").unwrap();
+    vm.invoke(&print_stack, ()).unwrap();
+
+    if let Ok(repr) = vm.to_repr(e.as_object()) {
+        println!("{}", repr.as_str());
+    }
+}
+
 impl fmt::Debug for PyObjectRef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // SAFETY: the vtable contains functions that accept payload types that always match up