Merge branch 'PHP-8.1'

dstogov · dstogov · commit ac2d85da4dcd · 2021-09-23T01:13:39.000+03:00
* PHP-8.1:
  Remove weird condition
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6240,14 +6240,12 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 				p++;
 				break;
 			}
-			if (p->op_array->fn_flags & ZEND_ACC_CLOSURE && !(p->op_array->fn_flags & ZEND_ACC_STATIC)) {
-				if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
-					if (TRACE_FRAME_IS_THIS_CHECKED(frame)) {
-						TRACE_FRAME_SET_THIS_CHECKED(call);
-					}
-				} else if (op_array->scope && !(op_array->fn_flags & ZEND_ACC_STATIC)) {
+			if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
+				if (TRACE_FRAME_IS_THIS_CHECKED(frame)) {
 					TRACE_FRAME_SET_THIS_CHECKED(call);
 				}
+			} else if (op_array->scope && !(op_array->fn_flags & ZEND_ACC_STATIC)) {
+				TRACE_FRAME_SET_THIS_CHECKED(call);
 			}
 			op_array = (zend_op_array*)p->op_array;
 			jit_extension =

Original file line number	Diff line number	Diff line change
`@@ -6240,14 +6240,12 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6240`	`6240`	`p++;`
`6241`	`6241`	`break;`
`6242`	`6242`	`}`
`6243`		`- if (p->op_array->fn_flags & ZEND_ACC_CLOSURE && !(p->op_array->fn_flags & ZEND_ACC_STATIC)) {`
`6244`		`- if (op_array->fn_flags & ZEND_ACC_CLOSURE) {`
`6245`		`- if (TRACE_FRAME_IS_THIS_CHECKED(frame)) {`
`6246`		`- TRACE_FRAME_SET_THIS_CHECKED(call);`
`6247`		`- }`
`6248`		`- } else if (op_array->scope && !(op_array->fn_flags & ZEND_ACC_STATIC)) {`
	`6243`	`+ if (op_array->fn_flags & ZEND_ACC_CLOSURE) {`
	`6244`	`+ if (TRACE_FRAME_IS_THIS_CHECKED(frame)) {`
`6249`	`6245`	`TRACE_FRAME_SET_THIS_CHECKED(call);`
`6250`	`6246`	`}`
	`6247`	`+ } else if (op_array->scope && !(op_array->fn_flags & ZEND_ACC_STATIC)) {`
	`6248`	`+ TRACE_FRAME_SET_THIS_CHECKED(call);`
`6251`	`6249`	`}`
`6252`	`6250`	`op_array = (zend_op_array*)p->op_array;`
`6253`	`6251`	`jit_extension =`