From 7c661bd30408c4acbd623ee310e468b4e2bb97bb Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 21 Jul 2015 18:06:19 +0200 Subject: Remove FAST_CALL_FROM_CATCH This was generated for a return from a try block with both a catch and a finally. However at this point no exception can be active, because it either didn't exist in the first place or was explicitly discarded using DISCARD_EXCEPTION. --- sapi/phpdbg/phpdbg_opcode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sapi/phpdbg/phpdbg_opcode.c') diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 75c91e0cf5..b8a0dfebba 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -68,9 +68,8 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */ /* EX */ switch (op->opcode) { case ZEND_FAST_CALL: - if (op->extended_value != 0) { - spprintf(&decode[0], 0, "FAST_CALL<%s>", - op->extended_value == ZEND_FAST_CALL_FROM_CATCH ? "FROM_CATCH" : "FROM_FINALLY"); + if (op->extended_value == ZEND_FAST_CALL_FROM_FINALLY) { + decode[0] = estrdup("FAST_CALL"); } break; case ZEND_FAST_RET: -- cgit v1.2.1