Merge branch 'master' into PHP-7.0.0

* master: (204 commits)
  Reverted ad4533fdbabcc3e545277e30023b2fdce16297a0
  update UPGRADING
  updated NEWS
  fix comment
  libwebp support for linux
  Replaced libvpx by libwebp (first draft; Windows only)
  update news with bug #70022
  Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
  Add tests for json_last_error()/json_last_error_msg() failures
  updated NEWS
  updated NEWS
  Exclude opcache from a few opcode related tests
  updated NEWS
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Fix various Windows issues (e.g. dir separators)
  Remove bogus exception_save() from FETCH_CLASS
  Fix readline/libedit build
  Do not use readline when not having a tty This is important for e.g. run-tests.php
  Add show_unexecuted option to phpdbg_end_oplog()
  ...

Conflicts:
	Zend/tests/temporary_cleaning_001.phpt
	Zend/tests/temporary_cleaning_003.phpt
	Zend/tests/temporary_cleaning_004.phpt
	Zend/tests/temporary_cleaning_005.phpt
	Zend/zend_compile.c
	Zend/zend_compile.h
	sapi/phpdbg/phpdbg_opcode.c

1 files changed, 58 insertions, 29 deletions

diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index 3af52f17cd..128dc591cf 100644
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -27,6 +27,15 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
+static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
+{
+	const char *ret = zend_get_opcode_name(opcode);
+	if (ret) {
+		return ret + 5; /* Skip ZEND_ prefix */
+	}
+	return "UNKNOWN";
+} /* }}} */
+
 static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type) /* {{{ */
 {
 	char *decode = NULL;
@@ -34,12 +43,14 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t
 	switch (type) {
 		case IS_CV: {
 			zend_string *var = ops->vars[EX_VAR_TO_NUM(op->var)];
-			asprintf(&decode, "$%.*s%c", ZSTR_LEN(var) <= 19 ? (int) ZSTR_LEN(var) : 18, ZSTR_VAL(var), ZSTR_LEN(var) <= 19 ? 0 : '+');
+			spprintf(&decode, 0, "$%.*s%c",
+				ZSTR_LEN(var) <= 19 ? (int) ZSTR_LEN(var) : 18,
+				ZSTR_VAL(var), ZSTR_LEN(var) <= 19 ? 0 : '+');
 		} break;
 
 		case IS_VAR:
 		case IS_TMP_VAR: {
-			asprintf(&decode, "@%" PRIu32, EX_VAR_TO_NUM(op->var) - ops->last_var);
+			spprintf(&decode, 0, "@%td", EX_VAR_TO_NUM(op->var) - ops->last_var);
 		} break;
 		case IS_CONST: {
 			zval *literal = RT_CONSTANT(ops, *op);
@@ -51,21 +62,38 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t
 
 char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 {
-	char *decode[4] = {NULL, NULL, NULL, NULL};
+	const char *opcode_name = phpdbg_decode_opcode(op->opcode);
+	char *result, *decode[4] = {NULL, NULL, NULL, NULL};
+
+	/* 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");
+		}
+		break;
+	case ZEND_FAST_RET:
+		if (op->extended_value != 0) {
+			spprintf(&decode[0], 0, "FAST_RET<%s>",
+				op->extended_value == ZEND_FAST_RET_TO_CATCH ? "TO_CATCH" : "TO_FINALLY");
+		}
+		break;
+	}
 
 	/* OP1 */
 	switch (op->opcode) {
 	case ZEND_JMP:
 	case ZEND_GOTO:
 	case ZEND_FAST_CALL:
-		asprintf(&decode[1], "J%ld", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
+		spprintf(&decode[1], 0, "J%td", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
 		break;
 
 	case ZEND_INIT_FCALL:
 	case ZEND_RECV:
 	case ZEND_RECV_INIT:
 	case ZEND_RECV_VARIADIC:
-		asprintf(&decode[1], "%" PRIu32, op->op1.num);
+		spprintf(&decode[1], 0, "%" PRIu32, op->op1.num);
 		break;
 
 	default:
@@ -75,9 +103,10 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 
 	/* OP2 */
 	switch (op->opcode) {
-	/* TODO: ZEND_FAST_CALL, ZEND_FAST_RET op2 */
 	case ZEND_JMPZNZ:
-		asprintf(&decode[2], "J%u or J%" PRIu32, OP_JMP_ADDR(op, op->op2) - ops->opcodes, ZEND_OFFSET_TO_OPLINE(op, op->extended_value) - ops->opcodes);
+		spprintf(&decode[2], 0, "J%td or J%td",
+			OP_JMP_ADDR(op, op->op2) - ops->opcodes,
+			ZEND_OFFSET_TO_OPLINE(op, op->extended_value) - ops->opcodes);
 		break;
 
 	case ZEND_JMPZ:
@@ -86,7 +115,14 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 	case ZEND_JMPNZ_EX:
 	case ZEND_JMP_SET:
 	case ZEND_ASSERT_CHECK:
-		asprintf(&decode[2], "J%ld", OP_JMP_ADDR(op, op->op2) - ops->opcodes);
+		spprintf(&decode[2], 0, "J%td", OP_JMP_ADDR(op, op->op2) - ops->opcodes);
+		break;
+
+	case ZEND_FAST_CALL:
+	case ZEND_FAST_RET:
+		if (op->extended_value != 0) {
+			spprintf(&decode[2], 0, "J%" PRIu32, op->op2.opline_num);
+		}
 		break;
 
 	case ZEND_SEND_VAL:
@@ -96,7 +132,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 	case ZEND_SEND_REF:
 	case ZEND_SEND_VAR_EX:
 	case ZEND_SEND_USER:
-		asprintf(&decode[2], "%" PRIu32, op->op2.num);
+		spprintf(&decode[2], 0, "%" PRIu32, op->op2.num);
 		break;
 
 	default:
@@ -107,27 +143,30 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */
 	/* RESULT */
 	switch (op->opcode) {
 	case ZEND_CATCH:
-		asprintf(&decode[2], "%" PRIu32, op->result.num);
+		spprintf(&decode[2], 0, "%" PRIu32, op->result.num);
 		break;
 	default:
 		decode[3] = phpdbg_decode_op(ops, &op->result, op->result_type);
 		break;
 	}
 
-	asprintf(&decode[0],
-		"%-20s %-20s %-20s",
+	spprintf(&result, 0,
+		"%-23s %-20s %-20s %-20s",
+		decode[0] ? decode[0] : opcode_name,
 		decode[1] ? decode[1] : "",
 		decode[2] ? decode[2] : "",
 		decode[3] ? decode[3] : "");
 
+	if (decode[0])
+		efree(decode[0]);
 	if (decode[1])
-		free(decode[1]);
+		efree(decode[1]);
 	if (decode[2])
-		free(decode[2]);
+		efree(decode[2]);
 	if (decode[3])
-		free(decode[3]);
+		efree(decode[3]);
 
-	return decode[0];
+	return result;
 } /* }}} */
 
 void phpdbg_print_opline_ex(zend_execute_data *execute_data, zend_bool ignore_flags) /* {{{ */
@@ -143,26 +182,22 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, zend_bool ignore_fl
 
 		if (ignore_flags || (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) || (PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) {
 			/* output line info */
-			phpdbg_notice("opline", "line=\"%u\" opline=\"%p\" opcode=\"%s\" op=\"%s\" file=\"%s\"", "L%-5u %16p %-30s %s %s",
+			phpdbg_notice("opline", "line=\"%u\" opline=\"%p\" op=\"%s\" file=\"%s\"", "L%-5u %16p %s %s",
 			   opline->lineno,
 			   opline,
-			   phpdbg_decode_opcode(opline->opcode),
 			   decode,
 			   execute_data->func->op_array.filename ? ZSTR_VAL(execute_data->func->op_array.filename) : "unknown");
 		}
 
 		if (!ignore_flags && PHPDBG_G(oplog)) {
-			phpdbg_log_ex(fileno(PHPDBG_G(oplog)), "L%-5u %16p %-30s %s %s",
+			phpdbg_log_ex(fileno(PHPDBG_G(oplog)), "L%-5u %16p %s %s",
 				opline->lineno,
 				opline,
-				phpdbg_decode_opcode(opline->opcode),
 				decode,
 				execute_data->func->op_array.filename ? ZSTR_VAL(execute_data->func->op_array.filename) : "unknown");
 		}
 
-		if (decode) {
-			free(decode);
-		}
+		efree(decode);
 	}
 
 	if (PHPDBG_G(oplog_list)) {
@@ -179,9 +214,3 @@ void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags
 {
 	phpdbg_print_opline_ex(execute_data, ignore_flags);
 } /* }}} */
-
-const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
-{
-	const char *ret = zend_get_opcode_name(opcode);
-	return ret?ret:"UNKNOWN";
-} /* }}} */