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-2Lines changed: 1 addition & 2 deletions b/‎Python/bytecodes.c
Copy file name to clipboardExpand all lines: Python/bytecodes.c
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎Python/executor_cases.c.h
Copy file name to clipboardExpand all lines: Python/executor_cases.c.h
+1-2Lines changed: 1 addition & 2 deletions b/‎Python/executor_cases.c.h
Copy file name to clipboardExpand all lines: Python/executor_cases.c.h
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎Python/generated_cases.c.h
Copy file name to clipboardExpand all lines: Python/generated_cases.c.h
+1-2Lines changed: 1 addition & 2 deletions b/‎Python/generated_cases.c.h
Copy file name to clipboardExpand all lines: Python/generated_cases.c.h
+1-2Lines changed: 1 addition & 2 deletions
@@ -1844,6 +1844,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``.
@@ -1535,10 +1535,8 @@ dummy_func(
             assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
             name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg);
             if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) {
-                Py_DECREF(class_dict);
                 GOTO_ERROR(error);
             }
-            Py_DECREF(class_dict);
             if (!value) {
                 PyObject *cell = GETLOCAL(oparg);
                 value = PyCell_GET(cell);
@@ -1548,6 +1546,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
`@@ -1535,10 +1535,8 @@ dummy_func(`
`1535`	`1535`	`assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);`
`1536`	`1536`	`name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg);`
`1537`	`1537`	`if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) {`
`1538`		`- Py_DECREF(class_dict);`
`1539`	`1538`	`GOTO_ERROR(error);`
`1540`	`1539`	`}`
`1541`		`- Py_DECREF(class_dict);`
`1542`	`1540`	`if (!value) {`
`1543`	`1541`	`PyObject *cell = GETLOCAL(oparg);`
`1544`	`1542`	`value = PyCell_GET(cell);`
`@@ -1548,6 +1546,7 @@ dummy_func(`
`1548`	`1546`	`}`
`1549`	`1547`	`Py_INCREF(value);`
`1550`	`1548`	`}`
	`1549`	`+ Py_DECREF(class_dict);`
`1551`	`1550`	`}`
`1552`	`1551`
`1553`	`1552`	`inst(LOAD_DEREF, ( -- value)) {`