mirror of
https://github.com/php/php-src.git
synced 2026-04-29 11:13:36 +02:00
5ee8413259
Squashed commit of the following: commit38e22106d4Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 15:12:19 2015 +0300 Added NEWS entry commit0a355935bfAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 15:06:32 2015 +0300 Inline function, to eliminate repeatable checks commitd937584f3aMerge:034162632677f5Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 14:35:49 2015 +0300 Merge branch 'master' into temporary_cleaning * master: Fixed bug #70006 (cli - function with default arg = STDOUT crash output). Fix x86 build Fixed use after free on closure_call_leak_with_exception.phpt Fixed test commit0341626ea9Merge:74869fadec35deAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 12:00:53 2015 +0300 Merge branch 'temporary_cleaning' of https://github.com/laruence/php-src into temporary_cleaning * 'temporary_cleaning' of https://github.com/laruence/php-src: Fixed checkpoint get Fixed crash of invalid pointer derefer cleanup commit74869fa673Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 11:45:34 2015 +0300 Fixed wrong GOTO resolution commitdec35ded32Author: Xinchen Hui <laruence@gmail.com> Date: Tue Jul 7 15:58:49 2015 +0800 Fixed checkpoint get commitb0f419540aAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 10:47:11 2015 +0300 Fixed crash of invalid pointer derefer (laruence) commit7a428d98caAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 10:35:47 2015 +0300 Fixed identation commit9c3a4dce9cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 10:33:52 2015 +0300 Fixed invalid size commit653abc670bAuthor: Xinchen Hui <laruence@gmail.com> Date: Tue Jul 7 11:29:14 2015 +0800 Fixed crash of invalid pointer derefer commite04500cedaAuthor: Xinchen Hui <laruence@gmail.com> Date: Tue Jul 7 11:28:26 2015 +0800 cleanup commit34183e1687Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 04:49:46 2015 +0300 op_array->T_liveliness compression commit2f6ad84579Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 04:44:44 2015 +0300 White spaces commitbe83f115a3Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 04:42:26 2015 +0300 Identation commit1f5084b990Merge:91b620d1adf3dfAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 04:41:54 2015 +0300 Merge branch 'master' into temporary_cleaning * master: Throw TypeError for invalid callback Fix crash when exception occurs during nested rope Fix crash when exception is thrown during ROPE_END Small cleanup in ternary compilation move the define to the right place fix ext/ldap build Rectify information about invalid shift warning being now ArithmeticError commit91b620d684Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 04:32:04 2015 +0300 Replace GOTO by FREE/FE_FREE and JMP at compile time commit7052e56979Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 7 02:25:08 2015 +0300 Use zend_regenerate_var_liveliness_info() to regenerate information after pass two. commitae72b0dc67Merge:a81c4bba919fe8Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 21:02:34 2015 +0300 Merge branch 'master' into temporary_cleaning * master: Do not display EXT_TYPE_UNUSED in phpdbg opcodes Run debug build with opcache on travis commita81c4bb8c6Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 20:59:34 2015 +0300 Improved algorithm. It's actually the same algorithm with second loop removed and simpler temporary data structures. The only difference may be in "re-defined" vatriable handling. Now live-range in that case started from the seconnd definition (this must be more safe). commit9a16810f7aMerge:bbfbe47001ecd3Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 17:57:45 2015 +0300 Merge branch 'master' into temporary_cleaning * master: Simplify TMP var number decoding (without HashTable) commitbbfbe470c8Merge:0bda4ab436b01eAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 17:02:01 2015 +0300 Merge branch 'master' into temporary_cleaning * master: Avoid dangerous optimization Fixed JMPZNZ instruction printing Attempt at falling back on ldap_find_control for Mac OS commit0bda4abea7Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 16:05:33 2015 +0300 Fixed live-range construction for OP_DATA opcode Added comments about algorithm assumtions commit521ad9df98Merge:4398daba09dcb0Author: Bob Weinand <bobwei9@hotmail.com> Date: Mon Jul 6 14:54:15 2015 +0200 Merge branch 'master' of https://github.com/php/php-src into temporary_cleaning commit4398dab82fAuthor: Bob Weinand <bobwei9@hotmail.com> Date: Mon Jul 6 13:51:27 2015 +0200 Add a few phpt tests related to temporary cleaning commit739656f83fAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 14:28:49 2015 +0300 Fixed Zend/tests/foreach_004.phpt failure (FE_FETCH shouldn't be included into TMP vatriablr live range) commit3df462a2bcAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 13:41:02 2015 +0300 Improve data layout (reduce the op_array structure size on 64-bit systems) commit883b73c56eAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 6 13:28:45 2015 +0300 Removed op_array->brk_cont_array commitae5e58b598Author: Bob Weinand <bobwei9@hotmail.com> Date: Mon Jul 6 04:22:58 2015 +0200 Fix bug with brk_cont variable free / free loop vars via temporary liveliness info commitb4223ca627Author: Bob Weinand <bobwei9@hotmail.com> Date: Mon Jul 6 04:07:07 2015 +0200 Fix bugs / cleanup fixes commitea33189d22Author: Xinchen Hui <laruence@gmail.com> Date: Sun Jul 5 20:58:38 2015 +0800 Removed useless TsTop commit1dbb007e4aMerge:550bbf83a8af24Author: Xinchen Hui <laruence@gmail.com> Date: Sat Jul 4 15:06:44 2015 +0800 Merge branch 'temporary_cleaning' of https://github.com/dstogov/php-src into temporary_cleaning commit3a8af24529Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 3 16:15:36 2015 +0300 More exceptions from regular liveliness analyses (with explanation in comments). Mark old "unexplained" exceptions with ???. commitba721efa2cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 3 14:16:09 2015 +0300 Print list of live temp variables (at least for internal debugging) commit8d1f88fe91Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 3 13:31:56 2015 +0300 Use op_array->T_liveliness to free incomplete ropes and restore error_reporting level on exception commit80c1d0d779Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 3 11:05:39 2015 +0300 Don't keep empty T_liveliness commit501ae8aaacAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 2 22:31:48 2015 +0300 Reverted changes to Zend/zend_arena.h. Reuse CG(arena) instead of creating a new one. commita4fce36907Merge:6ff7246fd0fcceAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 2 22:01:42 2015 +0300 Merge branch 'temporary_cleaning' of github.com:bwoebi/php-src into temporary_cleaning * 'temporary_cleaning' of github.com:bwoebi/php-src: Fix remaining issues with compacted temporaries Fix regression from last commit (+1 ?!) Fix off-by-one (opcache may remove last ZEND_RETURN) Speed algorithm up, more fail safety when reusing temporaries Dumb bug in opcode.c (forgot to update Ts[i]) Fix opcache support Exempt ROPE temporaries from freeing Hmm, we need temporary info for all the opcodes Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch) Add proper temporary cleaning upon frame abortion Fix arena on small sizes (size < sizeof(zend_arena)) commitfd0fcce811Author: Bob Weinand <bobwei9@hotmail.com> Date: Thu Jul 2 20:00:33 2015 +0200 Fix remaining issues with compacted temporaries commit427dc58bbbAuthor: Bob Weinand <bobwei9@hotmail.com> Date: Wed Jul 1 22:49:12 2015 +0200 Fix regression from last commit (+1 ?!) commit1adcf56a6eAuthor: Bob Weinand <bobwei9@hotmail.com> Date: Wed Jul 1 22:17:07 2015 +0200 Fix off-by-one (opcache may remove last ZEND_RETURN) commit25b231b784Author: Bob Weinand <bobwei9@hotmail.com> Date: Wed Jul 1 20:59:24 2015 +0200 Speed algorithm up, more fail safety when reusing temporaries commit22d9d05350Author: Bob Weinand <bobwei9@hotmail.com> Date: Wed Jul 1 16:48:46 2015 +0200 Dumb bug in opcode.c (forgot to update Ts[i]) commit6538269bfaAuthor: Bob Weinand <bobwei9@hotmail.com> Date: Wed Jul 1 13:05:52 2015 +0200 Fix opcache support commit333a7c4a88Author: Bob Weinand <bobwei9@hotmail.com> Date: Sat Jun 27 22:40:21 2015 +0200 Exempt ROPE temporaries from freeing commit02585f7708Author: Bob Weinand <bobwei9@hotmail.com> Date: Fri Jun 26 16:20:55 2015 +0200 Hmm, we need temporary info for all the opcodes commitcbcaedbd78Author: Bob Weinand <bobwei9@hotmail.com> Date: Fri Jun 26 01:04:09 2015 +0200 Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch) commitfef649f406Author: Bob Weinand <bobwei9@hotmail.com> Date: Fri Jun 26 01:02:27 2015 +0200 Add proper temporary cleaning upon frame abortion commit1cec2e7271Author: Bob Weinand <bobwei9@hotmail.com> Date: Thu Jun 25 23:33:21 2015 +0200 Fix arena on small sizes (size < sizeof(zend_arena))
712 lines
23 KiB
C
712 lines
23 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend OPcache |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1998-2015 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Andi Gutmans <andi@zend.com> |
|
|
| Zeev Suraski <zeev@zend.com> |
|
|
| Stanislav Malyshev <stas@zend.com> |
|
|
| Dmitry Stogov <dmitry@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* pass 1
|
|
* - substitute persistent constants (true, false, null, etc)
|
|
* - perform compile-time evaluation of constant binary and unary operations
|
|
* - optimize series of ADD_STRING and/or ADD_CHAR
|
|
* - convert CAST(IS_BOOL,x) into BOOL(x)
|
|
* - pre-evaluate constant function calls
|
|
*/
|
|
|
|
#include "php.h"
|
|
#include "Optimizer/zend_optimizer.h"
|
|
#include "Optimizer/zend_optimizer_internal.h"
|
|
#include "zend_API.h"
|
|
#include "zend_constants.h"
|
|
#include "zend_execute.h"
|
|
#include "zend_vm.h"
|
|
|
|
#define ZEND_IS_CONSTANT_TYPE(t) ((t) == IS_CONSTANT)
|
|
|
|
void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
|
|
{
|
|
int i = 0;
|
|
zend_op *opline = op_array->opcodes;
|
|
zend_op *end = opline + op_array->last;
|
|
zend_bool collect_constants = (op_array == &ctx->script->main_op_array);
|
|
|
|
while (opline < end) {
|
|
switch (opline->opcode) {
|
|
case ZEND_ADD:
|
|
case ZEND_SUB:
|
|
case ZEND_MUL:
|
|
case ZEND_DIV:
|
|
case ZEND_MOD:
|
|
case ZEND_POW:
|
|
case ZEND_SL:
|
|
case ZEND_SR:
|
|
case ZEND_CONCAT:
|
|
case ZEND_FAST_CONCAT:
|
|
case ZEND_IS_EQUAL:
|
|
case ZEND_IS_NOT_EQUAL:
|
|
case ZEND_IS_SMALLER:
|
|
case ZEND_IS_SMALLER_OR_EQUAL:
|
|
case ZEND_IS_IDENTICAL:
|
|
case ZEND_IS_NOT_IDENTICAL:
|
|
case ZEND_BW_OR:
|
|
case ZEND_BW_AND:
|
|
case ZEND_BW_XOR:
|
|
case ZEND_BOOL_XOR:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST &&
|
|
ZEND_OP2_TYPE(opline) == IS_CONST) {
|
|
/* binary operation with constant operands */
|
|
binary_op_type binary_op = get_binary_op(opline->opcode);
|
|
uint32_t tv = ZEND_RESULT(opline).var; /* temporary variable */
|
|
zval result;
|
|
int er;
|
|
|
|
if ((opline->opcode == ZEND_DIV || opline->opcode == ZEND_MOD) &&
|
|
zval_get_long(&ZEND_OP2_LITERAL(opline)) == 0) {
|
|
/* div by 0 */
|
|
break;
|
|
} else if ((opline->opcode == ZEND_SL || opline->opcode == ZEND_SR) &&
|
|
zval_get_long(&ZEND_OP2_LITERAL(opline)) < 0) {
|
|
/* shift by negative number */
|
|
break;
|
|
}
|
|
er = EG(error_reporting);
|
|
EG(error_reporting) = 0;
|
|
/* evaluate constant expression */
|
|
if (binary_op(&result, &ZEND_OP1_LITERAL(opline), &ZEND_OP2_LITERAL(opline)) != SUCCESS) {
|
|
EG(error_reporting) = er;
|
|
break;
|
|
}
|
|
EG(error_reporting) = er;
|
|
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_TMP_VAR, tv, &result)) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
literal_dtor(&ZEND_OP2_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_CAST:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST &&
|
|
opline->extended_value != IS_ARRAY &&
|
|
opline->extended_value != IS_OBJECT &&
|
|
opline->extended_value != IS_RESOURCE) {
|
|
/* cast of constant operand */
|
|
zend_uchar type = opline->result_type;
|
|
uint32_t tv = ZEND_RESULT(opline).var; /* temporary variable */
|
|
zval res;
|
|
res = ZEND_OP1_LITERAL(opline);
|
|
zval_copy_ctor(&res);
|
|
switch (opline->extended_value) {
|
|
case IS_NULL:
|
|
convert_to_null(&res);
|
|
break;
|
|
case _IS_BOOL:
|
|
convert_to_boolean(&res);
|
|
break;
|
|
case IS_LONG:
|
|
convert_to_long(&res);
|
|
break;
|
|
case IS_DOUBLE:
|
|
convert_to_double(&res);
|
|
break;
|
|
case IS_STRING:
|
|
convert_to_string(&res);
|
|
break;
|
|
}
|
|
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, type, tv, &res)) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
} else if (opline->extended_value == _IS_BOOL) {
|
|
/* T = CAST(X, IS_BOOL) => T = BOOL(X) */
|
|
opline->opcode = ZEND_BOOL;
|
|
opline->extended_value = 0;
|
|
}
|
|
break;
|
|
|
|
case ZEND_BW_NOT:
|
|
case ZEND_BOOL_NOT:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
/* unary operation on constant operand */
|
|
unary_op_type unary_op = get_unary_op(opline->opcode);
|
|
zval result;
|
|
uint32_t tv = ZEND_RESULT(opline).var; /* temporary variable */
|
|
int er;
|
|
|
|
er = EG(error_reporting);
|
|
EG(error_reporting) = 0;
|
|
if (unary_op(&result, &ZEND_OP1_LITERAL(opline)) != SUCCESS) {
|
|
EG(error_reporting) = er;
|
|
break;
|
|
}
|
|
EG(error_reporting) = er;
|
|
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_TMP_VAR, tv, &result)) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
break;
|
|
|
|
#if 0
|
|
case ZEND_ADD_STRING:
|
|
case ZEND_ADD_CHAR:
|
|
{
|
|
zend_op *next_op = opline + 1;
|
|
int requires_conversion = (opline->opcode == ZEND_ADD_CHAR? 1 : 0);
|
|
size_t final_length = 0;
|
|
zend_string *str;
|
|
char *ptr;
|
|
zend_op *last_op;
|
|
|
|
/* There is always a ZEND_RETURN at the end
|
|
if (next_op>=end) {
|
|
break;
|
|
}
|
|
*/
|
|
while (next_op->opcode == ZEND_ADD_STRING || next_op->opcode == ZEND_ADD_CHAR) {
|
|
if (ZEND_RESULT(opline).var != ZEND_RESULT(next_op).var) {
|
|
break;
|
|
}
|
|
if (next_op->opcode == ZEND_ADD_CHAR) {
|
|
final_length += 1;
|
|
} else { /* ZEND_ADD_STRING */
|
|
final_length += Z_STRLEN(ZEND_OP2_LITERAL(next_op));
|
|
}
|
|
next_op++;
|
|
}
|
|
if (final_length == 0) {
|
|
break;
|
|
}
|
|
last_op = next_op;
|
|
final_length += (requires_conversion? 1 : Z_STRLEN(ZEND_OP2_LITERAL(opline)));
|
|
str = zend_string_alloc(final_length, 0);
|
|
str->len = final_length;
|
|
ptr = str->val;
|
|
ptr[final_length] = '\0';
|
|
if (requires_conversion) { /* ZEND_ADD_CHAR */
|
|
char chval = (char)Z_LVAL(ZEND_OP2_LITERAL(opline));
|
|
|
|
ZVAL_NEW_STR(&ZEND_OP2_LITERAL(opline), str);
|
|
ptr[0] = chval;
|
|
opline->opcode = ZEND_ADD_STRING;
|
|
ptr++;
|
|
} else { /* ZEND_ADD_STRING */
|
|
memcpy(ptr, Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)));
|
|
ptr += Z_STRLEN(ZEND_OP2_LITERAL(opline));
|
|
zend_string_release(Z_STR(ZEND_OP2_LITERAL(opline)));
|
|
ZVAL_NEW_STR(&ZEND_OP2_LITERAL(opline), str);
|
|
}
|
|
next_op = opline + 1;
|
|
while (next_op < last_op) {
|
|
if (next_op->opcode == ZEND_ADD_STRING) {
|
|
memcpy(ptr, Z_STRVAL(ZEND_OP2_LITERAL(next_op)), Z_STRLEN(ZEND_OP2_LITERAL(next_op)));
|
|
ptr += Z_STRLEN(ZEND_OP2_LITERAL(next_op));
|
|
literal_dtor(&ZEND_OP2_LITERAL(next_op));
|
|
} else { /* ZEND_ADD_CHAR */
|
|
*ptr = (char)Z_LVAL(ZEND_OP2_LITERAL(next_op));
|
|
ptr++;
|
|
}
|
|
MAKE_NOP(next_op);
|
|
next_op++;
|
|
}
|
|
if (!((ZEND_OPTIMIZER_PASS_5|ZEND_OPTIMIZER_PASS_10) & OPTIMIZATION_LEVEL)) {
|
|
/* NOP removal is disabled => insert JMP over NOPs */
|
|
if (last_op-opline >= 3) { /* If we have more than 2 NOPS then JMP over them */
|
|
(opline + 1)->opcode = ZEND_JMP;
|
|
ZEND_OP1(opline + 1).opline_num = last_op - op_array->opcodes; /* that's OK even for ZE2, since opline_num's are resolved in pass 2 later */
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
#endif
|
|
|
|
case ZEND_FETCH_CONSTANT:
|
|
if (ZEND_OP1_TYPE(opline) == IS_UNUSED &&
|
|
ZEND_OP2_TYPE(opline) == IS_CONST &&
|
|
Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING &&
|
|
Z_STRLEN(ZEND_OP2_LITERAL(opline)) == sizeof("__COMPILER_HALT_OFFSET__") - 1 &&
|
|
memcmp(Z_STRVAL(ZEND_OP2_LITERAL(opline)), "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__") - 1) == 0) {
|
|
/* substitute __COMPILER_HALT_OFFSET__ constant */
|
|
zend_execute_data *orig_execute_data = EG(current_execute_data);
|
|
zend_execute_data fake_execute_data;
|
|
zval *offset;
|
|
|
|
memset(&fake_execute_data, 0, sizeof(zend_execute_data));
|
|
fake_execute_data.func = (zend_function*)op_array;
|
|
EG(current_execute_data) = &fake_execute_data;
|
|
if ((offset = zend_get_constant_str("__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__") - 1)) != NULL) {
|
|
uint32_t tv = ZEND_RESULT(opline).var;
|
|
|
|
if (zend_optimizer_replace_by_const(op_array, opline, IS_TMP_VAR, tv, offset)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
EG(current_execute_data) = orig_execute_data;
|
|
break;
|
|
}
|
|
|
|
if (ZEND_OP1_TYPE(opline) == IS_UNUSED &&
|
|
ZEND_OP2_TYPE(opline) == IS_CONST &&
|
|
Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
|
|
/* substitute persistent constants */
|
|
uint32_t tv = ZEND_RESULT(opline).var;
|
|
zval c;
|
|
|
|
if (!zend_optimizer_get_persistent_constant(Z_STR(ZEND_OP2_LITERAL(opline)), &c, 1)) {
|
|
if (!ctx->constants || !zend_optimizer_get_collected_constant(ctx->constants, &ZEND_OP2_LITERAL(opline), &c)) {
|
|
break;
|
|
}
|
|
}
|
|
if (Z_TYPE(c) == IS_CONSTANT_AST) {
|
|
break;
|
|
}
|
|
if (zend_optimizer_replace_by_const(op_array, opline, IS_TMP_VAR, tv, &c)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
|
|
/* class constant */
|
|
if (ZEND_OP1_TYPE(opline) != IS_UNUSED &&
|
|
ZEND_OP2_TYPE(opline) == IS_CONST &&
|
|
Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
|
|
|
|
zend_class_entry *ce = NULL;
|
|
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING) {
|
|
/* for A::B */
|
|
if (op_array->scope &&
|
|
!strncasecmp(Z_STRVAL(ZEND_OP1_LITERAL(opline)),
|
|
ZSTR_VAL(op_array->scope->name), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1)) {
|
|
ce = op_array->scope;
|
|
} else {
|
|
if ((ce = zend_hash_find_ptr(EG(class_table),
|
|
Z_STR(op_array->literals[opline->op1.constant + 1]))) == NULL ||
|
|
(ce->type == ZEND_INTERNAL_CLASS &&
|
|
ce->info.internal.module->type != MODULE_PERSISTENT) ||
|
|
(ce->type == ZEND_USER_CLASS &&
|
|
ZEND_CE_FILENAME(ce) != op_array->filename)) {
|
|
break;
|
|
}
|
|
}
|
|
} else if (op_array->scope &&
|
|
ZEND_OP1_TYPE(opline) == IS_VAR &&
|
|
(opline - 1)->opcode == ZEND_FETCH_CLASS &&
|
|
(ZEND_OP1_TYPE(opline - 1) == IS_UNUSED &&
|
|
((opline - 1)->extended_value & ~ZEND_FETCH_CLASS_NO_AUTOLOAD) == ZEND_FETCH_CLASS_SELF) &&
|
|
ZEND_RESULT((opline - 1)).var == ZEND_OP1(opline).var) {
|
|
/* for self::B */
|
|
ce = op_array->scope;
|
|
}
|
|
|
|
if (ce) {
|
|
uint32_t tv = ZEND_RESULT(opline).var;
|
|
zval *c, t;
|
|
|
|
if ((c = zend_hash_find(&ce->constants_table,
|
|
Z_STR(ZEND_OP2_LITERAL(opline)))) != NULL) {
|
|
ZVAL_DEREF(c);
|
|
if (Z_TYPE_P(c) == IS_CONSTANT_AST) {
|
|
break;
|
|
}
|
|
if (ZEND_IS_CONSTANT_TYPE(Z_TYPE_P(c))) {
|
|
if (!zend_optimizer_get_persistent_constant(Z_STR_P(c), &t, 1) ||
|
|
ZEND_IS_CONSTANT_TYPE(Z_TYPE(t))) {
|
|
break;
|
|
}
|
|
} else {
|
|
ZVAL_COPY_VALUE(&t, c);
|
|
zval_copy_ctor(&t);
|
|
}
|
|
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
} else {
|
|
MAKE_NOP((opline - 1));
|
|
}
|
|
if (zend_optimizer_replace_by_const(op_array, opline, IS_TMP_VAR, tv, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_DO_ICALL: {
|
|
zend_op *send1_opline = opline - 1;
|
|
zend_op *send2_opline = NULL;
|
|
zend_op *init_opline = NULL;
|
|
|
|
while (send1_opline->opcode == ZEND_NOP) {
|
|
send1_opline--;
|
|
}
|
|
if (send1_opline->opcode != ZEND_SEND_VAL ||
|
|
ZEND_OP1_TYPE(send1_opline) != IS_CONST) {
|
|
/* don't colllect constants after unknown function call */
|
|
collect_constants = 0;
|
|
break;
|
|
}
|
|
if (send1_opline->op2.num == 2) {
|
|
send2_opline = send1_opline;
|
|
send1_opline--;
|
|
while (send1_opline->opcode == ZEND_NOP) {
|
|
send1_opline--;
|
|
}
|
|
if (send1_opline->opcode != ZEND_SEND_VAL ||
|
|
ZEND_OP1_TYPE(send1_opline) != IS_CONST) {
|
|
/* don't colllect constants after unknown function call */
|
|
collect_constants = 0;
|
|
break;
|
|
}
|
|
}
|
|
init_opline = send1_opline - 1;
|
|
while (init_opline->opcode == ZEND_NOP) {
|
|
init_opline--;
|
|
}
|
|
if (init_opline->opcode != ZEND_INIT_FCALL ||
|
|
ZEND_OP2_TYPE(init_opline) != IS_CONST ||
|
|
Z_TYPE(ZEND_OP2_LITERAL(init_opline)) != IS_STRING) {
|
|
/* don't colllect constants after unknown function call */
|
|
collect_constants = 0;
|
|
break;
|
|
}
|
|
|
|
/* define("name", scalar); */
|
|
if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("define")-1 &&
|
|
zend_binary_strcasecmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)), Z_STRLEN(ZEND_OP2_LITERAL(init_opline)), "define", sizeof("define")-1) == 0) {
|
|
|
|
if (Z_TYPE(ZEND_OP1_LITERAL(send1_opline)) == IS_STRING &&
|
|
send2_opline &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(send2_opline)) <= IS_STRING) {
|
|
|
|
if (collect_constants) {
|
|
zend_optimizer_collect_constant(ctx, &ZEND_OP1_LITERAL(send1_opline), &ZEND_OP1_LITERAL(send2_opline));
|
|
}
|
|
|
|
if (RESULT_UNUSED(opline) &&
|
|
!zend_memnstr(Z_STRVAL(ZEND_OP1_LITERAL(send1_opline)), "::", sizeof("::") - 1, Z_STRVAL(ZEND_OP1_LITERAL(send1_opline)) + Z_STRLEN(ZEND_OP1_LITERAL(send1_opline)))) {
|
|
|
|
opline->opcode = ZEND_DECLARE_CONST;
|
|
opline->op1_type = IS_CONST;
|
|
opline->op2_type = IS_CONST;
|
|
opline->result_type = IS_UNUSED;
|
|
opline->op1.constant = send1_opline->op1.constant;
|
|
opline->op2.constant = send2_opline->op1.constant;
|
|
opline->result.num = 0;
|
|
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(send2_opline);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* pre-evaluate constant functions:
|
|
defined(x)
|
|
constant(x)
|
|
function_exists(x)
|
|
is_callable(x)
|
|
extension_loaded(x)
|
|
*/
|
|
if (!send2_opline &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(send1_opline)) == IS_STRING) {
|
|
if ((Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("function_exists")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"function_exists", sizeof("function_exists")-1) &&
|
|
!zend_optimizer_is_disabled_func("function_exists", sizeof("function_exists") - 1)) ||
|
|
(Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("is_callable")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"is_callable", sizeof("is_callable")) &&
|
|
!zend_optimizer_is_disabled_func("is_callable", sizeof("is_callable") - 1))) {
|
|
zend_internal_function *func;
|
|
zend_string *lc_name = zend_string_tolower(
|
|
Z_STR(ZEND_OP1_LITERAL(send1_opline)));
|
|
|
|
if ((func = zend_hash_find_ptr(EG(function_table), lc_name)) != NULL
|
|
&& func->type == ZEND_INTERNAL_FUNCTION
|
|
&& func->module->type == MODULE_PERSISTENT
|
|
#ifdef ZEND_WIN32
|
|
&& func->module->handle == NULL
|
|
#endif
|
|
) {
|
|
zval t;
|
|
if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("is_callable") - 1 ||
|
|
func->handler != ZEND_FN(display_disabled_function)) {
|
|
ZVAL_TRUE(&t);
|
|
} else {
|
|
ZVAL_FALSE(&t);
|
|
}
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
zend_string_release(lc_name);
|
|
break;
|
|
}
|
|
}
|
|
zend_string_release(lc_name);
|
|
} else if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("extension_loaded")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"extension_loaded", sizeof("extension_loaded")-1) &&
|
|
!zend_optimizer_is_disabled_func("extension_loaded", sizeof("extension_loaded") - 1)) {
|
|
zval t;
|
|
zend_string *lc_name = zend_string_tolower(
|
|
Z_STR(ZEND_OP1_LITERAL(send1_opline)));
|
|
zend_module_entry *m = zend_hash_find_ptr(&module_registry,
|
|
lc_name);
|
|
|
|
zend_string_release(lc_name);
|
|
if (!m) {
|
|
if (!PG(enable_dl)) {
|
|
break;
|
|
} else {
|
|
ZVAL_FALSE(&t);
|
|
}
|
|
} else {
|
|
if (m->type == MODULE_PERSISTENT
|
|
#ifdef ZEND_WIN32
|
|
&& m->handle == NULL
|
|
#endif
|
|
) {
|
|
ZVAL_TRUE(&t);
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
break;
|
|
}
|
|
} else if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("defined")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"defined", sizeof("defined")-1) &&
|
|
!zend_optimizer_is_disabled_func("defined", sizeof("defined") - 1)) {
|
|
zval t;
|
|
|
|
if (zend_optimizer_get_persistent_constant(Z_STR(ZEND_OP1_LITERAL(send1_opline)), &t, 0)) {
|
|
|
|
ZVAL_TRUE(&t);
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
break;
|
|
}
|
|
}
|
|
} else if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("constant")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"constant", sizeof("constant")-1) &&
|
|
!zend_optimizer_is_disabled_func("constant", sizeof("constant") - 1)) {
|
|
zval t;
|
|
|
|
if (zend_optimizer_get_persistent_constant(Z_STR(ZEND_OP1_LITERAL(send1_opline)), &t, 1)) {
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
break;
|
|
}
|
|
}
|
|
} else if ((CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) == 0 &&
|
|
Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("strlen") - 1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)), "strlen", sizeof("strlen") - 1) &&
|
|
!zend_optimizer_is_disabled_func("strlen", sizeof("strlen") - 1)) {
|
|
zval t;
|
|
|
|
ZVAL_LONG(&t, Z_STRLEN(ZEND_OP1_LITERAL(send1_opline)));
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
break;
|
|
}
|
|
/* dirname(IS_CONST/IS_STRING) -> IS_CONST/IS_STRING */
|
|
} else if (Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("dirname")-1 &&
|
|
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
|
|
"dirname", sizeof("dirname") - 1) &&
|
|
!zend_optimizer_is_disabled_func("dirname", sizeof("dirname") - 1) &&
|
|
IS_ABSOLUTE_PATH(Z_STRVAL(ZEND_OP1_LITERAL(send1_opline)), Z_STRLEN(ZEND_OP1_LITERAL(send1_opline)))) {
|
|
zend_string *dirname = zend_string_init(Z_STRVAL(ZEND_OP1_LITERAL(send1_opline)), Z_STRLEN(ZEND_OP1_LITERAL(send1_opline)), 0);
|
|
ZSTR_LEN(dirname) = zend_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
|
|
if (IS_ABSOLUTE_PATH(ZSTR_VAL(dirname), ZSTR_LEN(dirname))) {
|
|
zval t;
|
|
|
|
ZVAL_STR(&t, dirname);
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP2_LITERAL(init_opline));
|
|
MAKE_NOP(init_opline);
|
|
literal_dtor(&ZEND_OP1_LITERAL(send1_opline));
|
|
MAKE_NOP(send1_opline);
|
|
MAKE_NOP(opline);
|
|
break;
|
|
}
|
|
} else {
|
|
zend_string_release(dirname);
|
|
}
|
|
}
|
|
}
|
|
/* don't colllect constants after any other function call */
|
|
collect_constants = 0;
|
|
break;
|
|
}
|
|
case ZEND_STRLEN:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING) {
|
|
zval t;
|
|
|
|
ZVAL_LONG(&t, Z_STRLEN(ZEND_OP1_LITERAL(opline)));
|
|
if (zend_optimizer_replace_by_const(op_array, opline + 1, IS_TMP_VAR, ZEND_RESULT(opline).var, &t)) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
break;
|
|
case ZEND_DEFINED:
|
|
{
|
|
zval c;
|
|
uint32_t tv = ZEND_RESULT(opline).var;
|
|
if (!zend_optimizer_get_persistent_constant(Z_STR(ZEND_OP1_LITERAL(opline)), &c, 0)) {
|
|
break;
|
|
}
|
|
ZVAL_TRUE(&c);
|
|
if (zend_optimizer_replace_by_const(op_array, opline, IS_TMP_VAR, tv, &c)) {
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
break;
|
|
case ZEND_DECLARE_CONST:
|
|
if (collect_constants &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING &&
|
|
Z_TYPE(ZEND_OP2_LITERAL(opline)) <= IS_STRING) {
|
|
zend_optimizer_collect_constant(ctx, &ZEND_OP1_LITERAL(opline), &ZEND_OP2_LITERAL(opline));
|
|
}
|
|
break;
|
|
|
|
case ZEND_RETURN:
|
|
case ZEND_RETURN_BY_REF:
|
|
case ZEND_GENERATOR_RETURN:
|
|
case ZEND_EXIT:
|
|
case ZEND_THROW:
|
|
case ZEND_CATCH:
|
|
case ZEND_FAST_CALL:
|
|
case ZEND_FAST_RET:
|
|
case ZEND_JMP:
|
|
case ZEND_JMPZNZ:
|
|
case ZEND_JMPZ:
|
|
case ZEND_JMPNZ:
|
|
case ZEND_JMPZ_EX:
|
|
case ZEND_JMPNZ_EX:
|
|
case ZEND_FE_RESET_R:
|
|
case ZEND_FE_RESET_RW:
|
|
case ZEND_FE_FETCH_R:
|
|
case ZEND_FE_FETCH_RW:
|
|
case ZEND_NEW:
|
|
case ZEND_JMP_SET:
|
|
case ZEND_COALESCE:
|
|
case ZEND_ASSERT_CHECK:
|
|
collect_constants = 0;
|
|
break;
|
|
case ZEND_FETCH_R:
|
|
case ZEND_FETCH_W:
|
|
case ZEND_FETCH_RW:
|
|
case ZEND_FETCH_FUNC_ARG:
|
|
case ZEND_FETCH_IS:
|
|
case ZEND_FETCH_UNSET:
|
|
if (opline != op_array->opcodes &&
|
|
(opline-1)->opcode == ZEND_BEGIN_SILENCE &&
|
|
(opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_LOCAL &&
|
|
opline->op1_type == IS_CONST &&
|
|
opline->op2_type == IS_UNUSED &&
|
|
Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING &&
|
|
(Z_STRLEN(ZEND_OP1_LITERAL(opline)) != sizeof("this")-1 ||
|
|
memcmp(Z_STRVAL(ZEND_OP1_LITERAL(opline)), "this", sizeof("this") - 1) != 0)) {
|
|
|
|
int var = opline->result.var;
|
|
int level = 0;
|
|
zend_op *op = opline + 1;
|
|
zend_op *use = NULL;
|
|
|
|
while (op < end) {
|
|
if (op->opcode == ZEND_BEGIN_SILENCE) {
|
|
level++;
|
|
} else if (op->opcode == ZEND_END_SILENCE) {
|
|
if (level == 0) {
|
|
break;
|
|
} else {
|
|
level--;
|
|
}
|
|
}
|
|
if (op->op1_type == IS_VAR && op->op1.var == var) {
|
|
if (use) {
|
|
/* used more than once */
|
|
use = NULL;
|
|
break;
|
|
}
|
|
use = op;
|
|
} else if (op->op2_type == IS_VAR && op->op2.var == var) {
|
|
if (use) {
|
|
/* used more than once */
|
|
use = NULL;
|
|
break;
|
|
}
|
|
use = op;
|
|
}
|
|
op++;
|
|
}
|
|
if (use) {
|
|
if (use->op1_type == IS_VAR && use->op1.var == var) {
|
|
use->op1_type = IS_CV;
|
|
use->op1.var = zend_optimizer_lookup_cv(op_array,
|
|
Z_STR(ZEND_OP1_LITERAL(opline)));
|
|
MAKE_NOP(opline);
|
|
} else if (use->op2_type == IS_VAR && use->op2.var == var) {
|
|
use->op2_type = IS_CV;
|
|
use->op2.var = zend_optimizer_lookup_cv(op_array,
|
|
Z_STR(ZEND_OP1_LITERAL(opline)));
|
|
MAKE_NOP(opline);
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
opline++;
|
|
i++;
|
|
}
|
|
}
|