1
0
mirror of https://github.com/php/php-src.git synced 2026-04-18 05:21:02 +02:00

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug (assertion fails with extended info generated)
This commit is contained in:
Xinchen Hui
2017-10-17 19:47:40 +08:00

View File

@@ -488,6 +488,12 @@ static void dce_live_ranges(context *ctx, zend_op_array *op_array, zend_ssa *ssa
uint32_t var = live_range->var & ~ZEND_LIVE_MASK;
uint32_t def = live_range->start - 1;
if ((op_array->opcodes[def].result_type == IS_UNUSED) &&
(UNEXPECTED(op_array->opcodes[def].opcode == ZEND_EXT_STMT) ||
UNEXPECTED(op_array->opcodes[def].opcode == ZEND_EXT_FCALL_END))) {
def--;
}
if (op_array->opcodes[def].result_type == IS_UNUSED) {
if (op_array->opcodes[def].opcode == ZEND_DO_FCALL) {
/* constructor call */