Fix test_memoryview by excluding BEFORE_WITH

gvanrossum · gvanrossum · commit e3471dabacd0 · 2023-06-25T18:26:33.000-07:00
Unclear what's wrong with that opcode.
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -1195,8 +1195,6 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
     [MATCH_KEYS] = { .nuops = 1, .uops = { { MATCH_KEYS, 0, 0 } } },
     [GET_ITER] = { .nuops = 1, .uops = { { GET_ITER, 0, 0 } } },
     [GET_YIELD_FROM_ITER] = { .nuops = 1, .uops = { { GET_YIELD_FROM_ITER, 0, 0 } } },
-    [BEFORE_ASYNC_WITH] = { .nuops = 1, .uops = { { BEFORE_ASYNC_WITH, 0, 0 } } },
-    [BEFORE_WITH] = { .nuops = 1, .uops = { { BEFORE_WITH, 0, 0 } } },
     [WITH_EXCEPT_START] = { .nuops = 1, .uops = { { WITH_EXCEPT_START, 0, 0 } } },
     [PUSH_EXC_INFO] = { .nuops = 1, .uops = { { PUSH_EXC_INFO, 0, 0 } } },
     [EXIT_INIT_CHECK] = { .nuops = 1, .uops = { { EXIT_INIT_CHECK, 0, 0 } } },
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
@@ -313,6 +313,7 @@ def emit_macros(cls, out: Formatter):
     "exception_unwind",
     "import_from",
     "import_name",
+    "_PyObject_CallNoArgs",  # Proxy for BEFORE_WITH
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ def emit_macros(cls, out: Formatter):`
`313`	`313`	`"exception_unwind",`
`314`	`314`	`"import_from",`
`315`	`315`	`"import_name",`
	`316`	`+ "_PyObject_CallNoArgs", # Proxy for BEFORE_WITH`
`316`	`317`	`)`
`317`	`318`
`318`	`319`