Merge branch 'PHP-7.4'

dstogov · dstogov · commit ca6857060962 · 2019-07-16T22:56:47.000+03:00
* PHP-7.4:
  Provide type info
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -403,7 +403,7 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
 				 || opline->opcode == ZEND_SEND_VAL_EX
 				 || opline->opcode == ZEND_QM_ASSIGN) {
 					/* Update handlers to eliminate REFCOUNTED check */
-					zend_vm_set_opcode_handler_ex(opline, 0, 0, 0);
+					zend_vm_set_opcode_handler_ex(opline, 1 << Z_TYPE_P(opline->op1.zv), 0, 0);
 				}
 			}
 			if (opline->op2_type == IS_CONST) {

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc`
`403`	`403`	`\|\| opline->opcode == ZEND_SEND_VAL_EX`
`404`	`404`	`\|\| opline->opcode == ZEND_QM_ASSIGN) {`
`405`	`405`	`/* Update handlers to eliminate REFCOUNTED check */`
`406`		`- zend_vm_set_opcode_handler_ex(opline, 0, 0, 0);`
	`406`	`+ zend_vm_set_opcode_handler_ex(opline, 1 << Z_TYPE_P(opline->op1.zv), 0, 0);`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`	`if (opline->op2_type == IS_CONST) {`