@@ -664,15 +664,6 @@ extern const struct _PyCode_DEF(8) _Py_InitCleanup;
664664 * so consume 3 units of C stack */
665665#define PY_EVAL_C_STACK_UNITS 2
666666
667- #if defined(_MSC_VER ) && defined(_Py_USING_PGO )
668- /* gh-111786: _PyEval_EvalFrameDefault is too large to optimize for speed with
669- PGO on MSVC. Disable that optimization temporarily. If this is fixed
670- upstream, we should gate this on the version of MSVC.
671- */
672- # pragma optimize("t", off)
673- /* This setting is reversed below following _PyEval_EvalFrameDefault */
674- #endif
675-
676667PyObject * _Py_HOT_FUNCTION
677668_PyEval_EvalFrameDefault (PyThreadState * tstate , _PyInterpreterFrame * frame , int throwflag )
678669{
@@ -687,8 +678,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
687678#ifdef Py_STATS
688679 int lastopcode = 0 ;
689680#endif
690- int opcode ; /* Current opcode */
691- int oparg ; /* Current opcode argument, if any */
681+ uint16_t opcode ; /* Current opcode */
682+ int oparg ; /* Current opcode argument, if any */
692683#ifdef LLTRACE
693684 int lltrace = 0 ;
694685#endif
@@ -820,7 +811,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
820811#if USE_COMPUTED_GOTOS
821812 _unknown_opcode :
822813#else
823- EXTRA_CASES // From pycore_opcode .h, a 'case' for each unused opcode
814+ EXTRA_CASES // From pycore_opcode_metadata .h, a 'case' for each unused opcode
824815#endif
825816 /* Tell C compilers not to hold the opcode variable in the loop.
826817 next_instr points the current instruction without TARGET(). */
@@ -1087,7 +1078,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
10871078# pragma GCC diagnostic pop
10881079#elif defined(_MSC_VER ) /* MS_WINDOWS */
10891080# pragma warning(pop)
1090- # pragma optimize("", on)
10911081#endif
10921082
10931083static void
0 commit comments