From: Xinchen Hui <laruence@php.net>
Date: Wed, 24 Dec 2014 10:30:06 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~35^2~20^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4f89fbda4e5a95b6c988a445134b533dfeabaea;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
---

d4f89fbda4e5a95b6c988a445134b533dfeabaea
diff --cc ext/opcache/Optimizer/pass1_5.c
index 95a7ba0437,731040e960..5d6a8de7de
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@@ -501,52 -441,28 +501,54 @@@ void zend_optimizer_pass1(zend_op_arra
  						"constant", sizeof("constant")-1)) {
  					zval t;
  					
 -					if (zend_get_persistent_constant(Z_STRVAL(ZEND_OP1_LITERAL(opline - 1)),
 -						Z_STRLEN(ZEND_OP1_LITERAL(opline - 1)), &t, 1 TSRMLS_CC)) {
 -						if (replace_var_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC)) {
 -							literal_dtor(&ZEND_OP1_LITERAL(opline - 1));
 -							MAKE_NOP((opline - 1));
 -							literal_dtor(&ZEND_OP1_LITERAL(opline));
 +					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 ((!zend_hash_exists(&module_registry, "mbstring", sizeof("mbstring")) ||
 -							zend_ini_long("mbstring.func_overload",
 -								sizeof("mbstring.func_overload"), 0) < 2 /* MB_OVERLOAD_STRING */) &&
 -						Z_STRLEN(ZEND_OP1_LITERAL(opline)) == sizeof("strlen") - 1 &&
 -						!memcmp(Z_STRVAL(ZEND_OP1_LITERAL(opline)), "strlen", sizeof("strlen") - 1)) {
 +				} 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_hash_str_exists(&module_registry, "mbstring", sizeof("mbstring") - 1) ||
++					 zend_ini_long("mbstring.func_overload",
++						 sizeof("mbstring.func_overload") - 1, 0) < 2 /* MB_OVERLOAD_STRING */) &&
++					Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("strlen") - 1 &&
++					!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)), "strlen", sizeof("strlen") - 1)) {
  					zval t;
  
 -					ZVAL_LONG(&t, Z_STRLEN(ZEND_OP1_LITERAL(opline - 1)));
 -					if (replace_var_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC)) {
 -						literal_dtor(&ZEND_OP1_LITERAL(opline - 1));
 -						MAKE_NOP((opline - 1));
 -						literal_dtor(&ZEND_OP1_LITERAL(opline));
 +					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) &&
 +					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);
 +					dirname->len = zend_dirname(dirname->val, dirname->len);
 +					if (IS_ABSOLUTE_PATH(dirname->val, dirname->len)) {
 +						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);
  					}
  				}
  			}