@@ -1595,19 +1595,6 @@ is_method(PyObject **stack_pointer, int args) {
1595
1595
return PEEK (args + 2 ) != NULL ;
1596
1596
}
1597
1597
1598
- static PyObject *
1599
- dictkeys_get_value_by_index (PyDictKeysObject * dk , int index )
1600
- {
1601
- if (DK_IS_UNICODE (dk )) {
1602
- PyDictUnicodeEntry * ep = DK_UNICODE_ENTRIES (dk ) + index ;
1603
- return ep -> me_value ;
1604
- }
1605
- else {
1606
- PyDictKeyEntry * ep = DK_ENTRIES (dk ) + index ;
1607
- return ep -> me_value ;
1608
- }
1609
- }
1610
-
1611
1598
#define KWNAMES_LEN () \
1612
1599
(call_shape.kwnames == NULL ? 0 : ((int)PyTuple_GET_SIZE(call_shape.kwnames)))
1613
1600
@@ -3043,7 +3030,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
3043
3030
_PyLoadGlobalCache * cache = (_PyLoadGlobalCache * )next_instr ;
3044
3031
uint32_t version = read32 (& cache -> module_keys_version );
3045
3032
DEOPT_IF (dict -> ma_keys -> dk_version != version , LOAD_GLOBAL );
3046
- PyObject * res = dictkeys_get_value_by_index (dict -> ma_keys , cache -> index );
3033
+ assert (DK_IS_UNICODE (dict -> ma_keys ));
3034
+ PyDictUnicodeEntry * entries = DK_UNICODE_ENTRIES (dict -> ma_keys );
3035
+ PyObject * res = entries [cache -> index ].me_value ;
3047
3036
DEOPT_IF (res == NULL , LOAD_GLOBAL );
3048
3037
JUMPBY (INLINE_CACHE_ENTRIES_LOAD_GLOBAL );
3049
3038
STAT_INC (LOAD_GLOBAL , hit );
@@ -3063,7 +3052,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
3063
3052
uint16_t bltn_version = cache -> builtin_keys_version ;
3064
3053
DEOPT_IF (mdict -> ma_keys -> dk_version != mod_version , LOAD_GLOBAL );
3065
3054
DEOPT_IF (bdict -> ma_keys -> dk_version != bltn_version , LOAD_GLOBAL );
3066
- PyObject * res = dictkeys_get_value_by_index (bdict -> ma_keys , cache -> index );
3055
+ assert (DK_IS_UNICODE (bdict -> ma_keys ));
3056
+ PyDictUnicodeEntry * entries = DK_UNICODE_ENTRIES (bdict -> ma_keys );
3057
+ PyObject * res = entries [cache -> index ].me_value ;
3067
3058
DEOPT_IF (res == NULL , LOAD_GLOBAL );
3068
3059
JUMPBY (INLINE_CACHE_ENTRIES_LOAD_GLOBAL );
3069
3060
STAT_INC (LOAD_GLOBAL , hit );
0 commit comments