Commit 4cd24d6
committed
Modernize CALL_NO_KW_STR_1
1 parent d5a0831 commit 4cd24d6
3 files changed
Lines changed: 20 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2547,25 +2547,18 @@ dummy_func( | |||
| 2547 | 2547 | Py_DECREF(callable); | |
| 2548 | 2548 | } | |
| 2549 | 2549 | ||
| 2550 | - // stack effect: (__0, __array[oparg] -- ) | ||
| 2551 | - inst(CALL_NO_KW_STR_1) { | ||
| 2550 | + inst(CALL_NO_KW_STR_1, (unused/1, unused/2, unused/1, null, callable, args[oparg] -- res)) { | ||
| 2552 | 2551 | assert(kwnames == NULL); | |
| 2553 | 2552 | assert(cframe.use_tracing == 0); | |
| 2554 | 2553 | assert(oparg == 1); | |
| 2555 | - DEOPT_IF(is_method(stack_pointer, 1), CALL); | ||
| 2556 | - PyObject *callable = PEEK(2); | ||
| 2554 | + DEOPT_IF(null != NULL, CALL); | ||
| 2557 | 2555 | DEOPT_IF(callable != (PyObject *)&PyUnicode_Type, CALL); | |
| 2558 | 2556 | STAT_INC(CALL, hit); | |
| 2559 | - PyObject *arg = TOP(); | ||
| 2560 | - PyObject *res = PyObject_Str(arg); | ||
| 2557 | + PyObject *arg = args[0]; | ||
| 2558 | + res = PyObject_Str(arg); | ||
| 2561 | 2559 | Py_DECREF(arg); | |
| 2562 | 2560 | Py_DECREF(&PyUnicode_Type); | |
| 2563 | - STACK_SHRINK(2); | ||
| 2564 | - SET_TOP(res); | ||
| 2565 | - if (res == NULL) { | ||
| 2566 | - goto error; | ||
| 2567 | - } | ||
| 2568 | - JUMPBY(INLINE_CACHE_ENTRIES_CALL); | ||
| 2561 | + ERROR_IF(res == NULL, error); | ||
| 2569 | 2562 | CHECK_EVAL_BREAKER(); | |
| 2570 | 2563 | } | |
| 2571 | 2564 | ||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -297,7 +297,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) { | |||
| 297 | 297 | case CALL_NO_KW_TYPE_1: | |
| 298 | 298 | return oparg + 2; | |
| 299 | 299 | case CALL_NO_KW_STR_1: | |
| 300 | - return -1; | ||
| 300 | + return oparg + 2; | ||
| 301 | 301 | case CALL_NO_KW_TUPLE_1: | |
| 302 | 302 | return -1; | |
| 303 | 303 | case CALL_BUILTIN_CLASS: | |
@@ -643,7 +643,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) { | |||
| 643 | 643 | case CALL_NO_KW_TYPE_1: | |
| 644 | 644 | return 1; | |
| 645 | 645 | case CALL_NO_KW_STR_1: | |
| 646 | - return -1; | ||
| 646 | + return 1; | ||
| 647 | 647 | case CALL_NO_KW_TUPLE_1: | |
| 648 | 648 | return -1; | |
| 649 | 649 | case CALL_BUILTIN_CLASS: | |
@@ -847,7 +847,7 @@ struct opcode_metadata { | |||
| 847 | 847 | [CALL_PY_EXACT_ARGS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 }, | |
| 848 | 848 | [CALL_PY_WITH_DEFAULTS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 }, | |
| 849 | 849 | [CALL_NO_KW_TYPE_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 }, | |
| 850 | - [CALL_NO_KW_STR_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, | ||
| 850 | + [CALL_NO_KW_STR_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 }, | ||
| 851 | 851 | [CALL_NO_KW_TUPLE_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, | |
| 852 | 852 | [CALL_BUILTIN_CLASS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, | |
| 853 | 853 | [CALL_NO_KW_BUILTIN_O] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, | |
0 commit comments