]> granicus.if.org Git - php/commitdiff
Don't print try-catch offset for FAST_RET w/o ev
authorNikita Popov <nikic@php.net>
Thu, 21 Jan 2016 20:52:50 +0000 (21:52 +0100)
committerNikita Popov <nikic@php.net>
Thu, 21 Jan 2016 20:53:13 +0000 (21:53 +0100)
ext/opcache/Optimizer/zend_dump.c

index 295bf3f90aabd7ca4fdaefc044c97c6360128a80..20ba3cf381e51a4db1f25b9e2bf113d4be5659b3 100644 (file)
@@ -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);