Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed opcode description
This commit is contained in:
Dmitry Stogov 2019-07-08 11:21:54 +03:00
commit b8dae9981d
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -248,7 +248,7 @@ static uint32_t zend_vm_opcodes_flags[195] = {
0x00040751,
0x00040000,
0x04000701,
0x04005701,
0x04006701,
0x04000751,
0x04000000,
0x0b000101,