python
diff --git a/‎Include/internal/pycore_opcode_metadata.h‎
Lines changed: 2 additions & 2 deletions b/‎Include/internal/pycore_opcode_metadata.h‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Include/internal/pycore_uop_ids.h‎
Lines changed: 1 addition & 1 deletion b/‎Include/internal/pycore_uop_ids.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Include/internal/pycore_uop_metadata.h‎
Lines changed: 4 additions & 4 deletions b/‎Include/internal/pycore_uop_metadata.h‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Lib/test/test_capi/test_opt.py‎
Lines changed: 14 additions & 0 deletions b/‎Lib/test/test_capi/test_opt.py‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Core_and_Builtins/2025-06-28-17-54-27.gh-issue-134584.EXgPub.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Core_and_Builtins/2025-06-28-17-54-27.gh-issue-134584.EXgPub.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Python/bytecodes.c‎
Lines changed: 7 additions & 7 deletions b/‎Python/bytecodes.c‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎Python/executor_cases.c.h‎
Lines changed: 9 additions & 16 deletions b/‎Python/executor_cases.c.h‎
Lines changed: 9 additions & 16 deletions
diff --git a/‎Python/generated_cases.c.h‎
Lines changed: 13 additions & 10 deletions b/‎Python/generated_cases.c.h‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎Python/optimizer_bytecodes.c‎
Lines changed: 2 additions & 1 deletion b/‎Python/optimizer_bytecodes.c‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Python/optimizer_cases.c.h‎
Lines changed: 5 additions & 2 deletions b/‎Python/optimizer_cases.c.h‎
Lines changed: 5 additions & 2 deletions
@@ -1957,6 +1957,20 @@ def testfunc(n):
         self.assertNotIn("_GUARD_NOS_NULL", uops)
         self.assertNotIn("_GUARD_CALLABLE_STR_1", uops)
 
+    def test_call_str_1_pop_top(self):
+        def testfunc(n):
+            x = 0
+            for _ in range(n):
+                t = str("")
+                x += 1 if len(t) == 0 else 0
+            return x
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(res, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_CALL_STR_1", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+
     def test_call_str_1_result_is_str(self):
         def testfunc(n):
             x = 0
 
@@ -0,0 +1 @@
+Eliminate redundant refcounting from ``_CALL_STR_1``.
@@ -4040,18 +4040,17 @@ dummy_func(
             DEOPT_IF(callable_o != (PyObject *)&PyUnicode_Type);
         }
 
-        op(_CALL_STR_1, (callable, null, arg -- res)) {
+        op(_CALL_STR_1, (callable, null, arg -- res, a)) {
             PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
 
             assert(oparg == 1);
             STAT_INC(CALL, hit);
             PyObject *res_o = PyObject_Str(arg_o);
-            DEAD(null);
-            DEAD(callable);
-            (void)callable; // Silence compiler warnings about unused variables
-            (void)null;
-            PyStackRef_CLOSE(arg);
-            ERROR_IF(res_o == NULL);
+            if (res_o == NULL) {
+                ERROR_NO_POP();
+            }
+            a = arg;
+            INPUTS_DEAD();
             res = PyStackRef_FromPyObjectSteal(res_o);
         }
 
@@ -4061,6 +4060,7 @@ dummy_func(
             _GUARD_NOS_NULL +
             _GUARD_CALLABLE_STR_1 +
             _CALL_STR_1 +
+            POP_TOP +
             _CHECK_PERIODIC_AT_END;
 
         op(_GUARD_CALLABLE_TUPLE_1, (callable, unused, unused -- callable, unused, unused)) {
 
@@ -951,7 +951,7 @@ dummy_func(void) {
         }
     }
 
-    op(_CALL_STR_1, (unused, unused, arg -- res)) {
+    op(_CALL_STR_1, (unused, unused, arg -- res, a)) {
         if (sym_matches_type(arg, &PyUnicode_Type)) {
             // e.g. str('foo') or str(foo) where foo is known to be a string
             // Note: we must strip the reference information because it goes
@@ -961,6 +961,7 @@ dummy_func(void) {
         else {
             res = sym_new_type(ctx, &PyUnicode_Type);
         }
+        a = arg;
     }
 
     op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res)) {
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Eliminate redundant refcounting from ``_CALL_STR_1``.
Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ dummy_func(void) {`
`951`	`951`	`}`
`952`	`952`	`}`
`953`	`953`
`954`		`- op(_CALL_STR_1, (unused, unused, arg -- res)) {`
	`954`	`+ op(_CALL_STR_1, (unused, unused, arg -- res, a)) {`
`955`	`955`	`if (sym_matches_type(arg, &PyUnicode_Type)) {`
`956`	`956`	`// e.g. str('foo') or str(foo) where foo is known to be a string`
`957`	`957`	`// Note: we must strip the reference information because it goes`
`@@ -961,6 +961,7 @@ dummy_func(void) {`
`961`	`961`	`else {`
`962`	`962`	`res = sym_new_type(ctx, &PyUnicode_Type);`
`963`	`963`	`}`
	`964`	`+ a = arg;`
`964`	`965`	`}`
`965`	`966`
`966`	`967`	`op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res)) {`