python
diff --git a/‎Include/internal/pycore_opcode_metadata.h
Lines changed: 1 addition & 1 deletion b/‎Include/internal/pycore_opcode_metadata.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎Include/internal/pycore_uop_metadata.h
Lines changed: 1 addition & 1 deletion b/‎Include/internal/pycore_uop_metadata.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎Lib/test/test_capi/test_opt.py
Lines changed: 15 additions & 0 deletions b/‎Lib/test/test_capi/test_opt.py
Lines changed: 15 additions & 0 deletions
diff --git a/‎Python/bytecodes.c
Lines changed: 5 additions & 7 deletions b/‎Python/bytecodes.c
Lines changed: 5 additions & 7 deletions
diff --git a/‎Python/executor_cases.c.h
Lines changed: 4 additions & 10 deletions b/‎Python/executor_cases.c.h
Lines changed: 4 additions & 10 deletions
diff --git a/‎Python/generated_cases.c.h
Lines changed: 8 additions & 3 deletions b/‎Python/generated_cases.c.h
Lines changed: 8 additions & 3 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: 4 additions & 1 deletion b/‎Python/optimizer_cases.c.h
Lines changed: 4 additions & 1 deletion
@@ -1841,6 +1841,21 @@ def testfunc(n):
         uops = get_opnames(ex)
         self.assertNotIn("_GUARD_IS_NOT_NONE_POP", uops)
 
+    def test_call_type_1_pop_top(self):
+        def testfunc(n):
+            x = 0
+            for _ in range(n):
+                foo = eval('42')
+                x += type(foo) is int
+            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_TYPE_1", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+
     def test_call_str_1(self):
         def testfunc(n):
             x = 0
 
@@ -4030,25 +4030,23 @@ dummy_func(
             DEOPT_IF(callable_o != (PyObject *)&PyType_Type);
         }
 
-        op(_CALL_TYPE_1, (callable, null, arg -- res)) {
+        op(_CALL_TYPE_1, (callable, null, arg -- res, a)) {
             PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
 
             assert(oparg == 1);
-            DEAD(null);
-            DEAD(callable);
-            (void)callable; // Silence compiler warnings about unused variables
-            (void)null;
             STAT_INC(CALL, hit);
+            INPUTS_DEAD();
             res = PyStackRef_FromPyObjectNew(Py_TYPE(arg_o));
-            PyStackRef_CLOSE(arg);
+            a = arg;
         }
 
         macro(CALL_TYPE_1) =
             unused/1 +
             unused/2 +
             _GUARD_NOS_NULL +
             _GUARD_CALLABLE_TYPE_1 +
-            _CALL_TYPE_1;
+            _CALL_TYPE_1 +
+            POP_TOP;
 
         op(_GUARD_CALLABLE_STR_1, (callable, unused, unused -- callable, unused, unused)) {
             PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
 
@@ -969,7 +969,7 @@ dummy_func(void) {
        next = sym_new_type(ctx, &PyLong_Type);
     }
 
-    op(_CALL_TYPE_1, (unused, unused, arg -- res)) {
+    op(_CALL_TYPE_1, (unused, unused, arg -- res, a)) {
         PyObject* type = (PyObject *)sym_get_type(arg);
         if (type) {
             res = sym_new_const(ctx, type);
@@ -979,6 +979,7 @@ dummy_func(void) {
         else {
             res = sym_new_not_null(ctx);
         }
+        a = arg;
     }
 
     op(_CALL_STR_1, (unused, unused, arg -- res)) {
Original file line number	Diff line number	Diff line change
`@@ -969,7 +969,7 @@ dummy_func(void) {`
`969`	`969`	`next = sym_new_type(ctx, &PyLong_Type);`
`970`	`970`	`}`
`971`	`971`
`972`		`- op(_CALL_TYPE_1, (unused, unused, arg -- res)) {`
	`972`	`+ op(_CALL_TYPE_1, (unused, unused, arg -- res, a)) {`
`973`	`973`	`PyObject* type = (PyObject *)sym_get_type(arg);`
`974`	`974`	`if (type) {`
`975`	`975`	`res = sym_new_const(ctx, type);`
`@@ -979,6 +979,7 @@ dummy_func(void) {`
`979`	`979`	`else {`
`980`	`980`	`res = sym_new_not_null(ctx);`
`981`	`981`	`}`
	`982`	`+ a = arg;`
`982`	`983`	`}`
`983`	`984`
`984`	`985`	`op(_CALL_STR_1, (unused, unused, arg -- res)) {`