optimize _MAKE_HEAP_FUNCTION for owned references

Author: Sacul0457

Lib/test/test_capi/test_opt.py

@@ -1352,7 +1352,7 @@ def testfunc(n):
         self.assertNotIn("_MAKE_HEAP_SAFE", uops)
         self.assertIn("_YIELD_VALUE", uops)
 
-    def test_make_heap_safe_not_optimized_for_owned(self):
+    def test_make_heap_safe_optimized_owned(self):
         def returns_owned(x):
             return x + 1
         def testfunc(n):
@@ -1364,7 +1364,7 @@ def testfunc(n):
         self.assertEqual(res, TIER2_THRESHOLD)
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
-        self.assertIn("_MAKE_HEAP_SAFE", uops)
+        self.assertNotIn("_MAKE_HEAP_SAFE", uops)
         self.assertIn("_RETURN_VALUE", uops)
 
     def test_for_iter(self):

Python/optimizer_bytecodes.c

@@ -90,7 +90,7 @@ dummy_func(void) {
 
     op(_MAKE_HEAP_SAFE, (value -- value)) {
         // eliminate _MAKE_HEAP_SAFE when we *know* the value is immortal
-        if (sym_is_immortal(PyJitRef_Unwrap(value))) {
+        if (sym_is_immortal(PyJitRef_Unwrap(value)) || !PyJitRef_IsBorrowed(value)) {
             ADD_OP(_NOP, 0, 0);
         }
         value = PyJitRef_StripBorrowInfo(value);