Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Don't call _zend_hash_index_find() for packed arrays
This commit is contained in:
Dmitry Stogov 2021-11-08 13:13:48 +03:00
commit 03f149799a

View file

@ -254,8 +254,11 @@ static zval* ZEND_FASTCALL zend_jit_symtable_find(HashTable *ht, zend_string *st
static zval* ZEND_FASTCALL zend_jit_hash_index_lookup_rw_no_packed(HashTable *ht, zend_long idx) static zval* ZEND_FASTCALL zend_jit_hash_index_lookup_rw_no_packed(HashTable *ht, zend_long idx)
{ {
zval *retval = _zend_hash_index_find(ht, idx); zval *retval = NULL;
if (!HT_IS_PACKED(ht)) {
retval = _zend_hash_index_find(ht, idx);
}
if (!retval) { if (!retval) {
retval = zend_undefined_offset_write(ht, idx); retval = zend_undefined_offset_write(ht, idx);
} }