From 260294fc21b8ed7593766e241e73319982a2ce96 Mon Sep 17 00:00:00 2001
From: Fidget-Spinner <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Thu, 15 Jul 2021 21:51:17 +0800
Subject: [PATCH 1/2] Remove legacy opcache

---
 Include/cpython/code.h         |  2 --
 Include/internal/pycore_code.h | 23 -----------------------
 2 files changed, 25 deletions(-)

diff --git a/Include/cpython/code.h b/Include/cpython/code.h
index 8c00eb90bf0af83..b232f80367e7724 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 06a8b1b1e7df325..bc469763670d4ee 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
  */

From 4fadd75a493a10d12dc29ef5e96d0cfb66ca2d4b Mon Sep 17 00:00:00 2001
From: Fidget-Spinner <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Fri, 16 Jul 2021 22:28:21 +0800
Subject: [PATCH 2/2] fix old comment

---
 Objects/codeobject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index a5120ec01f5cb08..3dc9fd787f3859f 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()