From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 1 Mar 2021 21:01:01 +0000 (+0300)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c28751c69c9e2f923dd923fee5e1d4a3c970308a;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80802: (zend_jit_fetch_indirect_var assert failure with tracing JIT)
---

c28751c69c9e2f923dd923fee5e1d4a3c970308a
diff --cc ext/spl/spl_array.c
index 519e45a768,76e9fbae2b..83e4f014a1
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@@ -409,11 -362,11 +409,11 @@@ static zval *spl_array_get_dimension_pt
  					retval = &EG(uninitialized_zval);
  					break;
  				case BP_VAR_RW:
 -					zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, index);
 +					zend_error(E_WARNING, "Undefined array key " ZEND_LONG_FMT, key.h);
  				case BP_VAR_W: {
  				    zval value;
- 					ZVAL_UNDEF(&value);
+ 					ZVAL_NULL(&value);
 -					retval = zend_hash_index_update(ht, index, &value);
 +					retval = zend_hash_index_update(ht, key.h, &value);
  			   }
  			}
  		}