Merge branch 'PHP-7.4'

dstogov · dstogov · commit b8dae9981d89 · 2019-07-08T11:21:54.000+03:00
* PHP-7.4:
  Fixed opcode description
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -1018,7 +1018,7 @@ ZEND_VM_HANDLER(29, ZEND_ASSIGN_STATIC_PROP_OP, ANY, ANY, OP)
 	ZEND_VM_NEXT_OPCODE_EX(1, 2);
 }
 
-ZEND_VM_HANDLER(27, ZEND_ASSIGN_DIM_OP, VAR|CV, CONST|TMPVAR|UNUSED|THIS|CV, OP)
+ZEND_VM_HANDLER(27, ZEND_ASSIGN_DIM_OP, VAR|CV, CONST|TMPVAR|UNUSED|NEXT|CV, OP)
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2, free_op_data1;
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
@@ -248,7 +248,7 @@ static uint32_t zend_vm_opcodes_flags[195] = {
 	0x00040751,
 	0x00040000,
 	0x04000701,
-	0x04005701,
+	0x04006701,
 	0x04000751,
 	0x04000000,
 	0x0b000101,

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ ZEND_VM_HANDLER(29, ZEND_ASSIGN_STATIC_PROP_OP, ANY, ANY, OP)`
`1018`	`1018`	`ZEND_VM_NEXT_OPCODE_EX(1, 2);`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`		`-ZEND_VM_HANDLER(27, ZEND_ASSIGN_DIM_OP, VAR\|CV, CONST\|TMPVAR\|UNUSED\|THIS\|CV, OP)`
	`1021`	`+ZEND_VM_HANDLER(27, ZEND_ASSIGN_DIM_OP, VAR\|CV, CONST\|TMPVAR\|UNUSED\|NEXT\|CV, OP)`
`1022`	`1022`	`{`
`1023`	`1023`	`USE_OPLINE`
`1024`	`1024`	`zend_free_op free_op1, free_op2, free_op_data1;`