summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorIrit Katriel <1055913+iritkatriel@users.noreply.github.com>2023-08-23 17:39:00 (GMT)
committerGitHub <noreply@github.com>2023-08-23 17:39:00 (GMT)
commit72119d16a5f658939809febef29dadeca02cf34d (patch)
treecbcc9877f2a83559ee76c91a18330f1aeae36115 /Python
parent422f81b5d2359063826b8561f698d57e94f6a5d8 (diff)
downloadcpython-72119d16a5f658939809febef29dadeca02cf34d.zip
cpython-72119d16a5f658939809febef29dadeca02cf34d.tar.gz
cpython-72119d16a5f658939809febef29dadeca02cf34d.tar.bz2
gh-105481: remove regen-opcode. Generated _PyOpcode_Caches in regen-cases. (#108367)
Diffstat (limited to 'Python')
-rw-r--r--Python/assemble.c3
-rw-r--r--Python/ceval.c3
-rw-r--r--Python/compile.c1
-rw-r--r--Python/executor.c2
-rw-r--r--Python/instrumentation.c6
-rw-r--r--Python/optimizer.c1
-rw-r--r--Python/optimizer_analysis.c1
-rw-r--r--Python/specialize.c5
8 files changed, 13 insertions, 9 deletions
diff --git a/Python/assemble.c b/Python/assemble.c
index 4f66cf2..c770fd1 100644
--- a/Python/assemble.c
+++ b/Python/assemble.c
@@ -3,9 +3,8 @@
#include "Python.h"
#include "pycore_code.h" // write_location_entry_start()
#include "pycore_compile.h"
-#include "pycore_opcode.h" // _PyOpcode_Caches[] and opcode category macros
#include "pycore_opcode_utils.h" // IS_BACKWARDS_JUMP_OPCODE
-#include "pycore_opcode_metadata.h" // IS_PSEUDO_INSTR
+#include "pycore_opcode_metadata.h" // IS_PSEUDO_INSTR, _PyOpcode_Caches
#define DEFAULT_CODE_SIZE 128
diff --git a/Python/ceval.c b/Python/ceval.c
index f7dfaeb..55dfe6b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -14,8 +14,7 @@
#include "pycore_long.h" // _PyLong_GetZero()
#include "pycore_moduleobject.h" // PyModuleObject
#include "pycore_object.h" // _PyObject_GC_TRACK()
-#include "pycore_opcode.h" // EXTRA_CASES
-#include "pycore_opcode_metadata.h"
+#include "pycore_opcode_metadata.h" // EXTRA_CASES
#include "pycore_opcode_utils.h" // MAKE_FUNCTION_*
#include "pycore_pyerrors.h" // _PyErr_GetRaisedException()
#include "pycore_pystate.h" // _PyInterpreterState_GET()
diff --git a/Python/compile.c b/Python/compile.c
index b67a188..6b816b4 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -24,6 +24,7 @@
#include <stdbool.h>
#include "Python.h"
+#include "opcode.h"
#include "pycore_ast.h" // _PyAST_GetDocString()
#define NEED_OPCODE_TABLES
#include "pycore_opcode_utils.h"
diff --git a/Python/executor.c b/Python/executor.c
index 88c039d..0ff5106 100644
--- a/Python/executor.c
+++ b/Python/executor.c
@@ -1,5 +1,7 @@
#include "Python.h"
+#include "opcode.h"
+
#include "pycore_call.h"
#include "pycore_ceval.h"
#include "pycore_dict.h"
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index f77c2e6..8c7a3a0 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -1,4 +1,7 @@
#include "Python.h"
+
+#include "opcode_ids.h"
+
#include "pycore_call.h"
#include "pycore_frame.h"
#include "pycore_interp.h"
@@ -6,8 +9,7 @@
#include "pycore_modsupport.h" // _PyModule_CreateInitialized()
#include "pycore_namespace.h"
#include "pycore_object.h"
-#include "pycore_opcode.h"
-#include "pycore_opcode_metadata.h" // IS_VALID_OPCODE
+#include "pycore_opcode_metadata.h" // IS_VALID_OPCODE, _PyOpcode_Caches
#include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET()
diff --git a/Python/optimizer.c b/Python/optimizer.c
index 5751840..bbc1259 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -1,7 +1,6 @@
#include "Python.h"
#include "opcode.h"
#include "pycore_interp.h"
-#include "pycore_opcode.h"
#include "pycore_opcode_metadata.h"
#include "pycore_opcode_utils.h"
#include "pycore_optimizer.h"
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
index e48e018..2d177f1 100644
--- a/Python/optimizer_analysis.c
+++ b/Python/optimizer_analysis.c
@@ -1,7 +1,6 @@
#include "Python.h"
#include "opcode.h"
#include "pycore_interp.h"
-#include "pycore_opcode.h"
#include "pycore_opcode_metadata.h"
#include "pycore_opcode_utils.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET()
diff --git a/Python/specialize.c b/Python/specialize.c
index 2d514c0..a467f16 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -1,4 +1,7 @@
#include "Python.h"
+
+#include "opcode.h"
+
#include "pycore_code.h"
#include "pycore_descrobject.h" // _PyMethodWrapper_Type
#include "pycore_dict.h"
@@ -7,7 +10,7 @@
#include "pycore_long.h"
#include "pycore_moduleobject.h"
#include "pycore_object.h"
-#include "pycore_opcode.h" // _PyOpcode_Caches
+#include "pycore_opcode_metadata.h" // _PyOpcode_Caches
#include "pycore_pylifecycle.h" // _PyOS_URandomNonblock()