2013-04-18 18:12:31 +00:00
|
|
|
/* pass 4
|
|
|
|
* - optimize INIT_FCALL_BY_NAME to DO_FCALL
|
|
|
|
*/
|
2013-04-18 18:22:48 +00:00
|
|
|
#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
|
2013-04-18 18:12:31 +00:00
|
|
|
|
|
|
|
typedef struct _optimizer_call_info {
|
|
|
|
zend_function *func;
|
|
|
|
zend_op *opline;
|
|
|
|
} optimizer_call_info;
|
|
|
|
|
2014-06-18 13:09:37 +00:00
|
|
|
static void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx TSRMLS_DC) {
|
2013-04-18 18:12:31 +00:00
|
|
|
zend_op *opline = op_array->opcodes;
|
|
|
|
zend_op *end = opline + op_array->last;
|
|
|
|
int call = 0;
|
2014-06-30 11:43:45 +00:00
|
|
|
void *checkpoint;
|
|
|
|
optimizer_call_info *call_stack;
|
2013-04-18 18:12:31 +00:00
|
|
|
|
2014-06-30 11:43:45 +00:00
|
|
|
if (op_array->last < 2) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
checkpoint = zend_arena_checkpoint(ctx->arena);
|
|
|
|
call_stack = zend_arena_calloc(&ctx->arena, op_array->last / 2, sizeof(optimizer_call_info));
|
2013-04-18 18:12:31 +00:00
|
|
|
while (opline < end) {
|
|
|
|
switch (opline->opcode) {
|
|
|
|
case ZEND_INIT_FCALL_BY_NAME:
|
|
|
|
case ZEND_INIT_NS_FCALL_BY_NAME:
|
|
|
|
if (ZEND_OP2_TYPE(opline) == IS_CONST) {
|
|
|
|
zend_function *func;
|
2014-04-17 11:40:45 +00:00
|
|
|
zval *function_name = &op_array->literals[opline->op2.constant + 1];
|
2014-06-18 13:09:37 +00:00
|
|
|
if ((func = zend_hash_find_ptr(&ctx->script->function_table,
|
2014-03-28 19:34:49 +00:00
|
|
|
Z_STR_P(function_name))) != NULL) {
|
2013-04-18 18:12:31 +00:00
|
|
|
call_stack[call].func = func;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* break missing intentionally */
|
|
|
|
case ZEND_NEW:
|
|
|
|
case ZEND_INIT_METHOD_CALL:
|
|
|
|
case ZEND_INIT_STATIC_METHOD_CALL:
|
2014-06-30 11:43:45 +00:00
|
|
|
case ZEND_INIT_FCALL:
|
2014-07-10 20:32:18 +00:00
|
|
|
case ZEND_INIT_USER_CALL:
|
2013-04-18 18:12:31 +00:00
|
|
|
call_stack[call].opline = opline;
|
|
|
|
call++;
|
|
|
|
break;
|
2014-06-30 11:43:45 +00:00
|
|
|
case ZEND_DO_FCALL:
|
2013-04-18 18:12:31 +00:00
|
|
|
call--;
|
|
|
|
if (call_stack[call].func && call_stack[call].opline) {
|
|
|
|
zend_op *fcall = call_stack[call].opline;
|
|
|
|
|
2014-06-30 11:43:45 +00:00
|
|
|
if (fcall->opcode == ZEND_INIT_FCALL_BY_NAME) {
|
|
|
|
fcall->opcode = ZEND_INIT_FCALL;
|
2014-07-07 22:13:53 +00:00
|
|
|
Z_CACHE_SLOT(op_array->literals[fcall->op2.constant + 1]) = Z_CACHE_SLOT(op_array->literals[fcall->op2.constant]);
|
2014-06-30 11:43:45 +00:00
|
|
|
literal_dtor(&ZEND_OP2_LITERAL(fcall));
|
|
|
|
fcall->op2.constant = fcall->op2.constant + 1;
|
|
|
|
} else if (fcall->opcode == ZEND_INIT_NS_FCALL_BY_NAME) {
|
|
|
|
fcall->opcode = ZEND_INIT_FCALL;
|
2014-07-07 22:13:53 +00:00
|
|
|
Z_CACHE_SLOT(op_array->literals[fcall->op2.constant + 1]) = Z_CACHE_SLOT(op_array->literals[fcall->op2.constant]);
|
2014-06-30 11:43:45 +00:00
|
|
|
literal_dtor(&op_array->literals[fcall->op2.constant]);
|
2014-04-17 11:40:45 +00:00
|
|
|
literal_dtor(&op_array->literals[fcall->op2.constant + 2]);
|
2014-06-30 11:43:45 +00:00
|
|
|
fcall->op2.constant = fcall->op2.constant + 1;
|
|
|
|
} else {
|
|
|
|
ZEND_ASSERT(0);
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
} else if (opline->extended_value == 0 &&
|
|
|
|
call_stack[call].opline &&
|
2013-04-19 02:55:11 +00:00
|
|
|
call_stack[call].opline->opcode == ZEND_INIT_FCALL_BY_NAME &&
|
2013-04-18 18:12:31 +00:00
|
|
|
ZEND_OP2_TYPE(call_stack[call].opline) == IS_CONST) {
|
|
|
|
|
|
|
|
zend_op *fcall = call_stack[call].opline;
|
|
|
|
|
2014-06-30 11:43:45 +00:00
|
|
|
fcall->opcode = ZEND_INIT_FCALL;
|
2014-07-07 22:13:53 +00:00
|
|
|
Z_CACHE_SLOT(op_array->literals[fcall->op2.constant + 1]) = Z_CACHE_SLOT(op_array->literals[fcall->op2.constant]);
|
2013-04-18 18:12:31 +00:00
|
|
|
literal_dtor(&ZEND_OP2_LITERAL(fcall));
|
2014-06-30 11:43:45 +00:00
|
|
|
fcall->op2.constant = fcall->op2.constant + 1;
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
call_stack[call].func = NULL;
|
|
|
|
call_stack[call].opline = NULL;
|
|
|
|
break;
|
|
|
|
case ZEND_FETCH_FUNC_ARG:
|
|
|
|
case ZEND_FETCH_OBJ_FUNC_ARG:
|
|
|
|
case ZEND_FETCH_DIM_FUNC_ARG:
|
|
|
|
if (call_stack[call - 1].func) {
|
2013-04-19 03:06:38 +00:00
|
|
|
if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, (opline->extended_value & ZEND_FETCH_ARG_MASK))) {
|
2013-04-18 18:12:31 +00:00
|
|
|
opline->extended_value = 0;
|
|
|
|
opline->opcode -= 9;
|
|
|
|
} else {
|
|
|
|
opline->extended_value = 0;
|
|
|
|
opline->opcode -= 12;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2014-07-07 22:13:53 +00:00
|
|
|
case ZEND_SEND_VAL_EX:
|
|
|
|
if (call_stack[call - 1].func) {
|
2013-04-19 03:06:38 +00:00
|
|
|
if (ARG_MUST_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
|
2013-04-18 18:12:31 +00:00
|
|
|
/* We won't convert it into_DO_FCALL to emit error at run-time */
|
2013-04-19 03:06:38 +00:00
|
|
|
call_stack[call - 1].opline = NULL;
|
2013-04-18 18:12:31 +00:00
|
|
|
} else {
|
2014-07-07 22:13:53 +00:00
|
|
|
opline->opcode = ZEND_SEND_VAL;
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2014-07-07 22:13:53 +00:00
|
|
|
case ZEND_SEND_VAR_EX:
|
|
|
|
if (call_stack[call - 1].func) {
|
2013-04-19 03:06:38 +00:00
|
|
|
if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
|
2013-04-18 18:12:31 +00:00
|
|
|
opline->opcode = ZEND_SEND_REF;
|
2014-07-07 22:13:53 +00:00
|
|
|
} else {
|
|
|
|
opline->opcode = ZEND_SEND_VAR;
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ZEND_SEND_VAR_NO_REF:
|
|
|
|
if (!(opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) && call_stack[call - 1].func) {
|
2013-04-19 03:06:38 +00:00
|
|
|
if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
|
2013-04-18 18:12:31 +00:00
|
|
|
opline->extended_value |= ZEND_ARG_COMPILE_TIME_BOUND | ZEND_ARG_SEND_BY_REF;
|
|
|
|
} else if (opline->extended_value) {
|
|
|
|
opline->extended_value |= ZEND_ARG_COMPILE_TIME_BOUND;
|
|
|
|
} else {
|
|
|
|
opline->opcode = ZEND_SEND_VAR;
|
2014-07-07 22:13:53 +00:00
|
|
|
opline->extended_value = 0;
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2014-07-07 22:13:53 +00:00
|
|
|
#if 0
|
2013-04-18 18:12:31 +00:00
|
|
|
case ZEND_SEND_REF:
|
2014-06-30 11:43:45 +00:00
|
|
|
if (opline->extended_value != ZEND_ARG_COMPILE_TIME_BOUND && call_stack[call - 1].func) {
|
2013-04-18 18:12:31 +00:00
|
|
|
/* We won't handle run-time pass by reference */
|
2013-04-19 03:06:38 +00:00
|
|
|
call_stack[call - 1].opline = NULL;
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
|
|
|
break;
|
2014-07-07 22:13:53 +00:00
|
|
|
#endif
|
2014-01-15 07:09:38 +00:00
|
|
|
#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO
|
2014-01-14 14:34:08 +00:00
|
|
|
case ZEND_SEND_UNPACK:
|
|
|
|
call_stack[call - 1].func = NULL;
|
|
|
|
call_stack[call - 1].opline = NULL;
|
|
|
|
break;
|
|
|
|
#endif
|
2013-04-18 18:12:31 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
opline++;
|
|
|
|
}
|
|
|
|
|
2014-06-18 13:09:37 +00:00
|
|
|
zend_arena_release(&ctx->arena, checkpoint);
|
2013-04-18 18:12:31 +00:00
|
|
|
}
|
2013-04-18 18:22:48 +00:00
|
|
|
#endif
|