update error logic

Author: brijkapadia

Doc/tools/removed-ids.txt

@@ -6,6 +6,7 @@ c-api/file.html: deprecated-api
 
 # Removed sections
 library/asyncio-task.html: terminating-a-task-group
+library/dis.html: opcode-DELETE_GLOBAL
 deprecations/index.html: pending-removal-in-python-3-15
 deprecations/index.html: pending-removal-in-python-3-16
 deprecations/index.html: c-api-pending-removal-in-python-3-15

Include/internal/pycore_opcode_metadata.h

@@ -2191,22 +2191,19 @@ dummy_func(
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
             int err;
             if (PyStackRef_IsNull(v)) {
-                err = PyDict_Pop(GLOBALS(), name, NULL);
                 DEAD(v);
-                if (err < 0) {
-                    ERROR_NO_POP();
-                }
+                err = PyDict_Pop(GLOBALS(), name, NULL);
                 if (err == 0) {
+                    err = -1;
                     _PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
                                             NAME_ERROR_MSG, name);
-                    ERROR_NO_POP();
                 }
             }
             else {
                 err = PyDict_SetItem(GLOBALS(), name, PyStackRef_AsPyObjectBorrow(v));
                 PyStackRef_CLOSE(v);
-                ERROR_IF(err);
             }
+            ERROR_IF(err < 0);
         }
 
         inst(LOAD_LOCALS, ( -- locals)) {