python
diff --git a/‎Lib/test/test_exceptions.py
Copy file name to clipboardExpand all lines: Lib/test/test_exceptions.py
+7Lines changed: 7 additions & 0 deletions b/‎Lib/test/test_exceptions.py
Copy file name to clipboardExpand all lines: Lib/test/test_exceptions.py
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎Python/bytecodes.c
Copy file name to clipboardExpand all lines: Python/bytecodes.c
+1-3Lines changed: 1 addition & 3 deletions b/‎Python/bytecodes.c
Copy file name to clipboardExpand all lines: Python/bytecodes.c
+1-3Lines changed: 1 addition & 3 deletions
@@ -1824,6 +1824,13 @@ def f():
         self.assertIn("nonsense", err.getvalue())
         self.assertIn("ZeroDivisionError", err.getvalue())
 
+    def test_gh_111654(self):
+        def f():
+            class TestClass:
+                TestClass
+
+        self.assertRaises(NameError, f)
+
     # Note: name suggestion tests live in `test_traceback`.
 
 
 
@@ -0,0 +1,2 @@
+Fix runtime crash when some error happens in opcode
+``LOAD_FROM_DICT_OR_DEREF``.
@@ -1425,21 +1425,18 @@ dummy_func(
                     Py_INCREF(value);
                 }
                 else if (_PyErr_Occurred(tstate)) {
-                    Py_DECREF(class_dict);
                     goto error;
                 }
             }
             else {
                 value = PyObject_GetItem(class_dict, name);
                 if (value == NULL) {
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
-                        Py_DECREF(class_dict);
                         goto error;
                     }
                     _PyErr_Clear(tstate);
                 }
             }
-            Py_DECREF(class_dict);
             if (!value) {
                 PyObject *cell = GETLOCAL(oparg);
                 value = PyCell_GET(cell);
@@ -1449,6 +1446,7 @@ dummy_func(
                 }
                 Py_INCREF(value);
             }
+            Py_DECREF(class_dict);
         }
 
         inst(LOAD_DEREF, ( -- value)) {
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix runtime crash when some error happens in opcode`
	`2`	+``LOAD_FROM_DICT_OR_DEREF``.
Original file line number	Diff line number	Diff line change
`@@ -1425,21 +1425,18 @@ dummy_func(`
`1425`	`1425`	`Py_INCREF(value);`
`1426`	`1426`	`}`
`1427`	`1427`	`else if (_PyErr_Occurred(tstate)) {`
`1428`		`- Py_DECREF(class_dict);`
`1429`	`1428`	`goto error;`
`1430`	`1429`	`}`
`1431`	`1430`	`}`
`1432`	`1431`	`else {`
`1433`	`1432`	`value = PyObject_GetItem(class_dict, name);`
`1434`	`1433`	`if (value == NULL) {`
`1435`	`1434`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {`
`1436`		`- Py_DECREF(class_dict);`
`1437`	`1435`	`goto error;`
`1438`	`1436`	`}`
`1439`	`1437`	`_PyErr_Clear(tstate);`
`1440`	`1438`	`}`
`1441`	`1439`	`}`
`1442`		`- Py_DECREF(class_dict);`
`1443`	`1440`	`if (!value) {`
`1444`	`1441`	`PyObject *cell = GETLOCAL(oparg);`
`1445`	`1442`	`value = PyCell_GET(cell);`
`@@ -1449,6 +1446,7 @@ dummy_func(`
`1449`	`1446`	`}`
`1450`	`1447`	`Py_INCREF(value);`
`1451`	`1448`	`}`
	`1449`	`+ Py_DECREF(class_dict);`
`1452`	`1450`	`}`
`1453`	`1451`
`1454`	`1452`	`inst(LOAD_DEREF, ( -- value)) {`