com php-src: Don't print try-catch offset for FAST_RET w/o ev: ext/opcache/Optimizer/zend_dump.c

Commit: b1e4883d26c4c85cf1f7ba5f883750061a1453f8 Author: Nikita Popov <nikic@php.net> Thu, 21 Jan 2016 21:52:50 +0100 Parents: 7899498c6f89ee6125b9099ce835c811366570f3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1e4883d26c4c85cf1f7ba5f883750061a1453f8 Log: Don't print try-catch offset for FAST_RET w/o ev Changed paths: M ext/opcache/Optimizer/zend_dump.c Diff: diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index 295bf3f..20ba3cf 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -92,7 +92,9 @@ static void zend_dump_unused_op(const zend_op *opline, znode_op op, uint32_t fla if (ZEND_VM_OP_NUM == (flags & ZEND_VM_OP_MASK)) { fprintf(stderr, " %u", op.num); } else if (ZEND_VM_OP_TRY_CATCH == (flags & ZEND_VM_OP_MASK)) { - fprintf(stderr, " try-catch(%u)", op.num); + if (opline->opcode != ZEND_FAST_RET || opline->extended_value) { + fprintf(stderr, " try-catch(%u)", op.num); + } } else if (ZEND_VM_OP_LIVE_RANGE == (flags & ZEND_VM_OP_MASK)) { if (opline->extended_value & ZEND_FREE_ON_RETURN) { fprintf(stderr, " live-range(%u)", op.num);