Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  JIT: Fixed JIT for FETCH_OBJ when op1 is a reference of non-object

Author: dstogov

ext/opcache/jit/zend_jit_trace.c

@@ -4485,6 +4485,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							} else {
 								CHECK_OP1_TRACE_TYPE();
 							}
+							if (!(op1_info & MAY_BE_OBJECT)) {
+								break;
+							}
 							if (ssa->var_info && ssa->ops) {
 								if (ssa_op->op1_use >= 0) {
 									zend_ssa_var_info *op1_ssa = ssa->var_info + ssa_op->op1_use;
@@ -4557,6 +4560,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							} else {
 								CHECK_OP1_TRACE_TYPE();
 							}
+							if (!(op1_info & MAY_BE_OBJECT)) {
+								break;
+							}
 							if (ssa->var_info && ssa->ops) {
 								if (ssa_op->op1_use >= 0) {
 									zend_ssa_var_info *op1_ssa = ssa->var_info + ssa_op->op1_use;
@@ -4624,6 +4630,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							} else {
 								CHECK_OP1_TRACE_TYPE();
 							}
+							if (!(op1_info & MAY_BE_OBJECT)) {
+								break;
+							}
 							if (ssa->var_info && ssa->ops) {
 								if (ssa_op->op1_use >= 0) {
 									zend_ssa_var_info *op1_ssa = ssa->var_info + ssa_op->op1_use;
@@ -5555,9 +5564,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								}
 							} else {
 								CHECK_OP1_TRACE_TYPE();
-								if (!(op1_info & MAY_BE_OBJECT)) {
-									break;
-								}
+							}
+							if (!(op1_info & MAY_BE_OBJECT)) {
+								break;
 							}
 							if (ssa->var_info && ssa->ops) {
 								if (ssa_op->op1_use >= 0) {

ext/opcache/tests/jit/fetch_obj_005.phpt

@@ -0,0 +1,23 @@
+--TEST--
+JIT: FETCH_OBJ 005
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+opcache.jit=tracing
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+for ($i = 0; $i < 3; $i++) {
+	$a =& $b;
+	$a->p;
+}
+?>
+--EXPECTF--
+Warning: Attempt to read property "p" on null in %sfetch_obj_005.php on line 4
+
+Warning: Attempt to read property "p" on null in %sfetch_obj_005.php on line 4
+
+Warning: Attempt to read property "p" on null in %sfetch_obj_005.php on line 4