_PyCode_FastInfoFromOffset() -> _PyCode_FastInfoFromOparg().

python · ericsnowcurrently · May 18, 2021 · May 18, 2021 · May 18, 2021 · May 18, 2021
commit f7796274311cd05f987d871a39aa89c449d5aa72
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -95,9 +95,9 @@ PyAPI_FUNC(PyCodeObject *) _PyCode_New(struct _PyCodeConstructor *);
 int _PyCode_InitOpcache(PyCodeObject *co);
 
 PyAPI_FUNC(bool) _PyCode_HasFastlocals(PyCodeObject *, _PyFastLocalKind);
-PyAPI_FUNC(void) _PyCode_FastInfoFromOffset(PyCodeObject *, int,
-                                            _PyFastLocalKind,
-                                            PyObject **, _PyFastLocalKind *);
+PyAPI_FUNC(void) _PyCode_FastInfoFromOparg(PyCodeObject *, int,
+                                           _PyFastLocalKind,
+                                           PyObject **, _PyFastLocalKind *);
 PyAPI_FUNC(int) _PyCode_OffsetFromIndex(PyCodeObject *, int, _PyFastLocalKind);
 PyAPI_FUNC(int) _PyCode_CellForLocal(PyCodeObject *, int);
 

@@ -661,9 +661,9 @@ _PyCode_HasFastlocals(PyCodeObject *co, _PyFastLocalKind kind)
 }
 
 void
-_PyCode_FastInfoFromOffset(PyCodeObject *co, int offset,
-                           _PyFastLocalKind expected,
-                           PyObject **pname, _PyFastLocalKind *pkind)
+_PyCode_FastInfoFromOparg(PyCodeObject *co, int offset,
+                          _PyFastLocalKind expected,
+                          PyObject **pname, _PyFastLocalKind *pkind)
 {
     assert(offset >= 0);
     assert(expected > 0);

@@ -1820,9 +1820,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
         case TARGET(LOAD_FAST): {
             PyObject *value = GETLOCAL(oparg);
             if (value == NULL) {
-                PyObject *name = NULL;
-                _PyCode_FastInfoFromOffset(co, oparg, CO_FAST_LOCAL,
-                                           &name, NULL);
+                PyObject *name;
+                _PyCode_FastInfoFromOparg(co, oparg, CO_FAST_LOCAL,
+                                          &name, NULL);
                 format_exc_check_arg(tstate, PyExc_UnboundLocalError,
                                      UNBOUNDLOCAL_ERROR_MSG, name);
                 goto error;
@@ -3049,8 +3049,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
                 SETLOCAL(oparg, NULL);
                 DISPATCH();
             }
-            PyObject *name = NULL;
-            _PyCode_FastInfoFromOffset(co, oparg, CO_FAST_LOCAL, &name, NULL);
+            PyObject *name;
+            _PyCode_FastInfoFromOparg(co, oparg, CO_FAST_LOCAL, &name, NULL);
             format_exc_check_arg(tstate, PyExc_UnboundLocalError,
                                  UNBOUNDLOCAL_ERROR_MSG, name);
             goto error;
@@ -6427,10 +6427,10 @@ format_exc_unbound(PyThreadState *tstate, PyCodeObject *co, int oparg)
     if (_PyErr_Occurred(tstate)) {
         return;
     }
-    PyObject *name = NULL;
+    PyObject *name;
     _PyFastLocalKind kind;
-    _PyCode_FastInfoFromOffset(co, oparg, CO_FAST_CELL | CO_FAST_FREE,
-                               &name, &kind);
+    _PyCode_FastInfoFromOparg(co, oparg, CO_FAST_CELL | CO_FAST_FREE,
+                              &name, &kind);
     if (kind & CO_FAST_CELL) {
         format_exc_check_arg(tstate, PyExc_UnboundLocalError,
                              UNBOUNDLOCAL_ERROR_MSG, name);