pythonGH-111485: Make BEFORE_WITH a uop (pythonGH-111812)

hugovk · Nov 8, 2023 · 8134614 · 8134614
1 parent 8ac1b5b
commit 8134614
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 7 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2765,7 +2765,7 @@ dummy_func(
  GOTO_ERROR(error);
  }
  DECREF_INPUTS();
- res = _PyObject_CallNoArgs(enter);
+ res = _PyObject_CallNoArgsTstate(tstate, enter);
  Py_DECREF(enter);
  if (res == NULL) {
  Py_DECREF(exit);
@@ -2774,7 +2774,6 @@ dummy_func(
  }
 
  inst(BEFORE_WITH, (mgr -- exit, res)) {
- TIER_ONE_ONLY
  /* pop the context manager, push its __exit__ and the
  * value returned from calling its __enter__
  */
@@ -2801,7 +2800,7 @@ dummy_func(
  GOTO_ERROR(error);
  }
  DECREF_INPUTS();
- res = _PyObject_CallNoArgs(enter);
+ res = _PyObject_CallNoArgsTstate(tstate, enter);
  Py_DECREF(enter);
  if (res == NULL) {
  Py_DECREF(exit);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h