From: Anatol Belski <ab@php.net>
Date: Tue, 16 May 2017 10:49:19 +0000 (+0200)
Subject: avoid strlen in common case
X-Git-Tag: php-7.2.0alpha2~15^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5bc862470b0635d51967b82c9324efcd69286c8;p=php

avoid strlen in common case
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 5485a1c6cb..82da49a702 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6503,9 +6503,9 @@ static zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
 			zend_string *filename = CG(compiled_filename);
 			zend_string *dirname = zend_string_init(ZSTR_VAL(filename), ZSTR_LEN(filename), 0);
 #ifdef ZEND_WIN32
-			php_win32_ioutil_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
+			ZSTR_LEN(dirname) = php_win32_ioutil_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
 #else
-			zend_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
+			ZSTR_LEN(dirname) = zend_dirname(ZSTR_VAL(dirname), ZSTR_LEN(dirname));
 #endif
 
 			if (strcmp(ZSTR_VAL(dirname), ".") == 0) {
@@ -6515,9 +6515,9 @@ static zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
 #elif HAVE_GETWD
 				ZEND_IGNORE_VALUE(VCWD_GETWD(ZSTR_VAL(dirname)));
 #endif
+				ZSTR_LEN(dirname) = strlen(ZSTR_VAL(dirname));
 			}
 
-			ZSTR_LEN(dirname) = strlen(ZSTR_VAL(dirname));
 			ZVAL_STR(zv, dirname);
 			break;
 		}