mirror of
https://github.com/php/php-src.git
synced 2026-03-26 01:02:25 +01:00
Squashed commit of the following: commit1e41295097Author: Dmitry Stogov <dmitry@zend.com> Date: Sat Jan 31 07:28:58 2015 +0300 Generalize HashTableIterator API to allows its usage without involvement of HashTable.nInternalPonter commit5406f21b11Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 18:08:43 2015 +0300 Reduced alghorithms complexity commitb37f1d58d2Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 18:08:30 2015 +0300 Fixed test name commitfb2d079645Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 18:08:05 2015 +0300 API cleanup commit08302c0d6dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 14:20:46 2015 +0300 Make array_splice() to preserve foreach hash position commitcc4b7be41eAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 12:24:31 2015 +0300 Make internal function, operation on array passed by reference, to preserve foreach hash position commit5aa9712b0aAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 09:49:35 2015 +0300 Implement consistent behavior for foreach by value over plain object commit4c5b385ff5Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jan 30 07:56:37 2015 +0300 More careful iterators update. commit721fc9e80dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jan 29 21:43:28 2015 +0300 Added new test commit15a23b1218Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jan 29 21:05:02 2015 +0300 Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details) commit10a3260b1fAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jan 29 21:04:44 2015 +0300 New test commiteef80c5837Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jan 28 16:52:21 2015 +0300 Fixed foreach by reference iteration over constant array commit61e7391873Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jan 28 14:59:54 2015 +0300 Fixed temporary variable re-allocation pass commit92e90c09f0Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jan 28 12:44:57 2015 +0300 Fixed operand destruction in case of exceptions in iterator commitdd2a36a207Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jan 28 10:02:34 2015 +0300 Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE) commit4638f7b914Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jan 28 07:43:28 2015 +0300 Change "foreach" statement behavior (this is just a PoC yet) - "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy. - it makes no difference if array given to "foreach by value" is reference itself - "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)
240 lines
7.5 KiB
C
240 lines
7.5 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 2:
|
|
* - convert non-numeric constants to numeric constants in numeric operators
|
|
* - optimize constant conditional JMPs
|
|
* - optimize static BRKs and CONTs
|
|
*/
|
|
|
|
#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"
|
|
|
|
void zend_optimizer_pass2(zend_op_array *op_array)
|
|
{
|
|
zend_op *opline;
|
|
zend_op *end = op_array->opcodes + op_array->last;
|
|
|
|
opline = op_array->opcodes;
|
|
while (opline < end) {
|
|
switch (opline->opcode) {
|
|
case ZEND_ADD:
|
|
case ZEND_SUB:
|
|
case ZEND_MUL:
|
|
case ZEND_DIV:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP1_LITERAL(opline)) == IS_STRING) {
|
|
convert_scalar_to_number(&ZEND_OP1_LITERAL(opline));
|
|
}
|
|
}
|
|
/* break missing *intentionally* - the assign_op's may only optimize op2 */
|
|
case ZEND_ASSIGN_ADD:
|
|
case ZEND_ASSIGN_SUB:
|
|
case ZEND_ASSIGN_MUL:
|
|
case ZEND_ASSIGN_DIV:
|
|
if (opline->extended_value != 0) {
|
|
/* object tristate op - don't attempt to optimize it! */
|
|
break;
|
|
}
|
|
if (ZEND_OP2_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
|
|
convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_MOD:
|
|
case ZEND_SL:
|
|
case ZEND_SR:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_LONG) {
|
|
convert_to_long(&ZEND_OP1_LITERAL(opline));
|
|
}
|
|
}
|
|
/* break missing *intentionally - the assign_op's may only optimize op2 */
|
|
case ZEND_ASSIGN_MOD:
|
|
case ZEND_ASSIGN_SL:
|
|
case ZEND_ASSIGN_SR:
|
|
if (opline->extended_value != 0) {
|
|
/* object tristate op - don't attempt to optimize it! */
|
|
break;
|
|
}
|
|
if (ZEND_OP2_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_LONG) {
|
|
convert_to_long(&ZEND_OP2_LITERAL(opline));
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_CONCAT:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_STRING) {
|
|
convert_to_string(&ZEND_OP1_LITERAL(opline));
|
|
}
|
|
}
|
|
/* break missing *intentionally - the assign_op's may only optimize op2 */
|
|
case ZEND_ASSIGN_CONCAT:
|
|
if (opline->extended_value != 0) {
|
|
/* object tristate op - don't attempt to optimize it! */
|
|
break;
|
|
}
|
|
if (ZEND_OP2_TYPE(opline) == IS_CONST) {
|
|
if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
|
|
convert_to_string(&ZEND_OP2_LITERAL(opline));
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_JMPZ_EX:
|
|
case ZEND_JMPNZ_EX:
|
|
/* convert Ti = JMPZ_EX(Ti, L) to JMPZ(Ti, L) */
|
|
if (0 && /* FIXME: temporary disable unsafe pattern */
|
|
ZEND_OP1_TYPE(opline) == IS_TMP_VAR &&
|
|
ZEND_RESULT_TYPE(opline) == IS_TMP_VAR &&
|
|
ZEND_OP1(opline).var == ZEND_RESULT(opline).var) {
|
|
opline->opcode -= 3;
|
|
/* convert Ti = JMPZ_EX(C, L) => Ti = QM_ASSIGN(C)
|
|
in case we know it wouldn't jump */
|
|
} else if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
|
|
if (opline->opcode == ZEND_JMPZ_EX) {
|
|
should_jmp = !should_jmp;
|
|
}
|
|
if (!should_jmp) {
|
|
opline->opcode = ZEND_QM_ASSIGN;
|
|
SET_UNUSED(opline->op2);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_JMPZ:
|
|
case ZEND_JMPNZ:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
|
|
|
|
if (opline->opcode == ZEND_JMPZ) {
|
|
should_jmp = !should_jmp;
|
|
}
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
ZEND_OP1_TYPE(opline) = IS_UNUSED;
|
|
if (should_jmp) {
|
|
opline->opcode = ZEND_JMP;
|
|
COPY_NODE(opline->op1, opline->op2);
|
|
} else {
|
|
MAKE_NOP(opline);
|
|
}
|
|
break;
|
|
}
|
|
if ((opline + 1)->opcode == ZEND_JMP) {
|
|
/* JMPZ(X, L1), JMP(L2) => JMPZNZ(X, L1, L2) */
|
|
/* JMPNZ(X, L1), JMP(L2) => JMPZNZ(X, L2, L1) */
|
|
if (ZEND_OP2(opline).opline_num == ZEND_OP1(opline + 1).opline_num) {
|
|
/* JMPZ(X, L1), JMP(L1) => NOP, JMP(L1) */
|
|
MAKE_NOP(opline);
|
|
} else {
|
|
if (opline->opcode == ZEND_JMPZ) {
|
|
opline->extended_value = ZEND_OP1(opline + 1).opline_num;
|
|
} else {
|
|
opline->extended_value = ZEND_OP2(opline).opline_num;
|
|
COPY_NODE(opline->op2, (opline + 1)->op1);
|
|
}
|
|
opline->opcode = ZEND_JMPZNZ;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case ZEND_JMPZNZ:
|
|
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
|
|
int opline_num;
|
|
if (zend_is_true(&ZEND_OP1_LITERAL(opline))) {
|
|
opline_num = opline->extended_value; /* JMPNZ */
|
|
} else {
|
|
opline_num = ZEND_OP2(opline).opline_num; /* JMPZ */
|
|
}
|
|
literal_dtor(&ZEND_OP1_LITERAL(opline));
|
|
ZEND_OP1(opline).opline_num = opline_num;
|
|
ZEND_OP1_TYPE(opline) = IS_UNUSED;
|
|
opline->opcode = ZEND_JMP;
|
|
}
|
|
break;
|
|
|
|
case ZEND_BRK:
|
|
case ZEND_CONT:
|
|
{
|
|
zend_brk_cont_element *jmp_to;
|
|
int array_offset;
|
|
int nest_levels;
|
|
int dont_optimize = 0;
|
|
|
|
ZEND_ASSERT(ZEND_OP2_TYPE(opline) == IS_CONST);
|
|
ZEND_ASSERT(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_LONG);
|
|
|
|
nest_levels = Z_LVAL(ZEND_OP2_LITERAL(opline));
|
|
|
|
array_offset = ZEND_OP1(opline).opline_num;
|
|
while (1) {
|
|
if (array_offset == -1) {
|
|
dont_optimize = 1; /* don't optimize this bogus break/continue, let the executor shout */
|
|
break;
|
|
}
|
|
jmp_to = &op_array->brk_cont_array[array_offset];
|
|
array_offset = jmp_to->parent;
|
|
if (--nest_levels > 0) {
|
|
if (op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE ||
|
|
op_array->opcodes[jmp_to->brk].opcode == ZEND_FE_FREE ||
|
|
op_array->opcodes[jmp_to->brk].opcode == ZEND_END_SILENCE) {
|
|
dont_optimize = 1;
|
|
break;
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (dont_optimize) {
|
|
break;
|
|
}
|
|
|
|
/* optimize - convert to a JMP */
|
|
switch (opline->opcode) {
|
|
case ZEND_BRK:
|
|
MAKE_NOP(opline);
|
|
ZEND_OP1(opline).opline_num = jmp_to->brk;
|
|
break;
|
|
case ZEND_CONT:
|
|
MAKE_NOP(opline);
|
|
ZEND_OP1(opline).opline_num = jmp_to->cont;
|
|
break;
|
|
}
|
|
opline->opcode = ZEND_JMP;
|
|
/* MAKE_NOP() already set op1 and op2 to IS_UNUSED */
|
|
}
|
|
break;
|
|
}
|
|
opline++;
|
|
}
|
|
}
|