From: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Fri, 16 Jul 2021 15:49:35 +0000 (+0800)
Subject: Remove legacy opcache structs (GH-27164)
X-Git-Tag: v3.11.0a1~651
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9cd47d0e58cd468d6482d7ba59730b134d0d521;p=thirdparty%2FPython%2Fcpython.git

Remove legacy opcache structs (GH-27164)
---

diff --git a/Include/cpython/code.h b/Include/cpython/code.h
index 8c00eb90bf0a..b232f80367e7 100644
--- a/Include/cpython/code.h
+++ b/Include/cpython/code.h
@@ -23,8 +23,6 @@ typedef uint16_t _Py_CODEUNIT;
 #  define _Py_MAKECODEUNIT(opcode, oparg) ((opcode)|((oparg)<<8))
 #endif
 
-typedef struct _PyOpcache _PyOpcache;
-
 
 /* Bytecode object */
 struct PyCodeObject {
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 06a8b1b1e7df..bc469763670d 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -4,29 +4,6 @@
 extern "C" {
 #endif
 
-/* Legacy Opcache */
-
-typedef struct {
-    PyObject *ptr;  /* Cached pointer (borrowed reference) */
-    uint64_t globals_ver;  /* ma_version of global dict */
-    uint64_t builtins_ver; /* ma_version of builtin dict */
-} _PyOpcache_LoadGlobal;
-
-typedef struct {
-    PyTypeObject *type;
-    Py_ssize_t hint;
-    unsigned int tp_version_tag;
-} _PyOpCodeOpt_LoadAttr;
-
-struct _PyOpcache {
-    union {
-        _PyOpcache_LoadGlobal lg;
-        _PyOpCodeOpt_LoadAttr la;
-    } u;
-    char optimized;
-};
-
-
 /* PEP 659
  * Specialization and quickening structs and helper functions
  */
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index a5120ec01f5c..3dc9fd787f38 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -4,7 +4,7 @@
 #include "code.h"
 #include "opcode.h"
 #include "structmember.h"         // PyMemberDef
-#include "pycore_code.h"          // _PyOpcache
+#include "pycore_code.h"          // _PyCodeConstructor
 #include "pycore_interp.h"        // PyInterpreterState.co_extra_freefuncs
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "pycore_tuple.h"         // _PyTuple_ITEMS()