From: Nikita Popov <nikic@php.net>
Date: Thu, 21 Jan 2016 20:52:50 +0000 (+0100)
Subject: Don't print try-catch offset for FAST_RET w/o ev
X-Git-Tag: php-7.2.0alpha1~620^2~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e4883d26c4c85cf1f7ba5f883750061a1453f8;p=php

Don't print try-catch offset for FAST_RET w/o ev
---

diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c
index 295bf3f90a..20ba3cf381 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);