Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fixed memory leak

Author: dstogov

Zend/Optimizer/sccp.c

@@ -1524,13 +1524,13 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 
 						dup_partial_object(&zv, op1);
 						ct_eval_assign_obj(&zv, &tmp2, op2);
-						if (opline->opcode == ZEND_PRE_INC_OBJ
-								|| opline->opcode == ZEND_PRE_DEC_OBJ) {
+						if (opline->opcode == ZEND_PRE_INC_OBJ || opline->opcode == ZEND_PRE_DEC_OBJ) {
 							SET_RESULT(result, &tmp2);
-							zval_ptr_dtor_nogc(&tmp1);
 						} else {
 							SET_RESULT(result, &tmp1);
 						}
+						zval_ptr_dtor_nogc(&tmp1);
+						zval_ptr_dtor_nogc(&tmp2);
 						SET_RESULT(op1, &zv);
 						zval_ptr_dtor_nogc(&zv);
 						break;

ext/opcache/tests/opt/sccp_038.phpt

@@ -0,0 +1,18 @@
+--TEST--
+SCCP 038: Memory leak
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--FILE--
+<?php
+function foo() {
+    $obj = new stdClass;
+    $obj->$b = ~$b = $a = '##';
+    $obj->$a++;
+}
+foo();
+?>
+DONE
+--EXPECT--
+DONE