Revert unnecessary vm change

iluuu1994 · iluuu1994 · commit 264eb0df2e6c · 2022-06-09T11:42:22.000+02:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -5903,8 +5903,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 				}
 			}
 			if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-				ce = c->ce;
-				zval_update_constant_ex(value, ce);
+				zval_update_constant_ex(value, c->ce);
 				if (UNEXPECTED(EG(exception) != NULL)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 					HANDLE_EXCEPTION();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -7072,8 +7072,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_CONS
 				}
 			}
 			if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-				ce = c->ce;
-				zval_update_constant_ex(value, ce);
+				zval_update_constant_ex(value, c->ce);
 				if (UNEXPECTED(EG(exception) != NULL)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 					HANDLE_EXCEPTION();
@@ -24624,8 +24623,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_
 				}
 			}
 			if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-				ce = c->ce;
-				zval_update_constant_ex(value, ce);
+				zval_update_constant_ex(value, c->ce);
 				if (UNEXPECTED(EG(exception) != NULL)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 					HANDLE_EXCEPTION();
@@ -33469,8 +33467,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUS
 				}
 			}
 			if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-				ce = c->ce;
-				zval_update_constant_ex(value, ce);
+				zval_update_constant_ex(value, c->ce);
 				if (UNEXPECTED(EG(exception) != NULL)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 					HANDLE_EXCEPTION();

Original file line number	Diff line number	Diff line change
`@@ -5903,8 +5903,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR\|CONST\|UNUSED\|CLASS_FETCH, CO`
`5903`	`5903`	`}`
`5904`	`5904`	`}`
`5905`	`5905`	`if (Z_TYPE_P(value) == IS_CONSTANT_AST) {`
`5906`		`- ce = c->ce;`
`5907`		`- zval_update_constant_ex(value, ce);`
	`5906`	`+ zval_update_constant_ex(value, c->ce);`
`5908`	`5907`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`5909`	`5908`	`ZVAL_UNDEF(EX_VAR(opline->result.var));`
`5910`	`5909`	`HANDLE_EXCEPTION();`
Original file line number	Diff line number	Diff line change
`@@ -7072,8 +7072,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_CONS`
`7072`	`7072`	`}`
`7073`	`7073`	`}`
`7074`	`7074`	`if (Z_TYPE_P(value) == IS_CONSTANT_AST) {`
`7075`		`- ce = c->ce;`
`7076`		`- zval_update_constant_ex(value, ce);`
	`7075`	`+ zval_update_constant_ex(value, c->ce);`
`7077`	`7076`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`7078`	`7077`	`ZVAL_UNDEF(EX_VAR(opline->result.var));`
`7079`	`7078`	`HANDLE_EXCEPTION();`
`@@ -24624,8 +24623,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_`
`24624`	`24623`	`}`
`24625`	`24624`	`}`
`24626`	`24625`	`if (Z_TYPE_P(value) == IS_CONSTANT_AST) {`
`24627`		`- ce = c->ce;`
`24628`		`- zval_update_constant_ex(value, ce);`
	`24626`	`+ zval_update_constant_ex(value, c->ce);`
`24629`	`24627`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`24630`	`24628`	`ZVAL_UNDEF(EX_VAR(opline->result.var));`
`24631`	`24629`	`HANDLE_EXCEPTION();`
`@@ -33469,8 +33467,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUS`
`33469`	`33467`	`}`
`33470`	`33468`	`}`
`33471`	`33469`	`if (Z_TYPE_P(value) == IS_CONSTANT_AST) {`
`33472`		`- ce = c->ce;`
`33473`		`- zval_update_constant_ex(value, ce);`
	`33470`	`+ zval_update_constant_ex(value, c->ce);`
`33474`	`33471`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`33475`	`33472`	`ZVAL_UNDEF(EX_VAR(opline->result.var));`
`33476`	`33473`	`HANDLE_EXCEPTION();`