Skip to content

Commit 4bd7bb6

Browse files
committed
Fix test_memoryview again by excluding BEFORE_WITH
Apparently the fix using SET_LOCALS_FROM_FRAME() isn't enough (it fixes some but not all failures). Possibly the problem is due to having *two* BEFORE_WITH uops in one trace? Unclear what's wrong with that opcode.
1 parent 00f8f2c commit 4bd7bb6

File tree

3 files changed

+1
-83
lines changed

3 files changed

+1
-83
lines changed

Python/executor_cases.c.h

-81
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Python/opcode_metadata.h

-2
Original file line numberDiff line numberDiff line change
@@ -1195,8 +1195,6 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
11951195
[MATCH_KEYS] = { .nuops = 1, .uops = { { MATCH_KEYS, 0, 0 } } },
11961196
[GET_ITER] = { .nuops = 1, .uops = { { GET_ITER, 0, 0 } } },
11971197
[GET_YIELD_FROM_ITER] = { .nuops = 1, .uops = { { GET_YIELD_FROM_ITER, 0, 0 } } },
1198-
[BEFORE_ASYNC_WITH] = { .nuops = 1, .uops = { { BEFORE_ASYNC_WITH, 0, 0 } } },
1199-
[BEFORE_WITH] = { .nuops = 1, .uops = { { BEFORE_WITH, 0, 0 } } },
12001198
[WITH_EXCEPT_START] = { .nuops = 1, .uops = { { WITH_EXCEPT_START, 0, 0 } } },
12011199
[PUSH_EXC_INFO] = { .nuops = 1, .uops = { { PUSH_EXC_INFO, 0, 0 } } },
12021200
[EXIT_INIT_CHECK] = { .nuops = 1, .uops = { { EXIT_INIT_CHECK, 0, 0 } } },

Tools/cases_generator/generate_cases.py

+1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ def emit_macros(cls, out: Formatter):
313313
"exception_unwind",
314314
"import_from",
315315
"import_name",
316+
"_PyObject_CallNoArgs", # Proxy for BEFORE_WITH
316317
)
317318

318319

0 commit comments

Comments
 (0)