[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c

[Felipe Pena]

felipe                                   Mon, 20 Jun 2011 01:21:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312320

Log:
- Avoid re-hash here too

Changed paths:
    U   php/php-src/branches/PHP_5_4/Zend/zend_compile.c
    U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c    2011-06-20 00:03:39 UTC 
(rev 312319)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c    2011-06-20 01:21:47 UTC 
(rev 312320)
@@ -633,8 +633,12 @@
        zend_llist *fetch_list_ptr;

        if (varname->op_type == IS_CONST) {
+               ulong hash = 0;
+
                if (Z_TYPE(varname->u.constant) != IS_STRING) {
                        convert_to_string(&varname->u.constant);
+               } else if (IS_INTERNED(Z_STRVAL(varname->u.constant))) {
+                       hash = INTERNED_HASH(Z_STRVAL(varname->u.constant));
                }
                if (!zend_is_auto_global(varname->u.constant.value.str.val, 
varname->u.constant.value.str.len TSRMLS_CC) &&
                    !(varname->u.constant.value.str.len == (sizeof("this")-1) &&
@@ -642,7 +646,7 @@
                    (CG(active_op_array)->last == 0 ||
                     
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != 
ZEND_BEGIN_SILENCE)) {
                        result->op_type = IS_CV;
-                       result->u.op.var = lookup_cv(CG(active_op_array), 
varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0 
TSRMLS_CC);
+                       result->u.op.var = lookup_cv(CG(active_op_array), 
varname->u.constant.value.str.val, varname->u.constant.value.str.len, hash 
TSRMLS_CC);
                        varname->u.constant.value.str.val = 
CG(active_op_array)->vars[result->u.op.var].name;
                        result->EA = 0;
                        return;

Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c       2011-06-20 00:03:39 UTC (rev 
312319)
+++ php/php-src/trunk/Zend/zend_compile.c       2011-06-20 01:21:47 UTC (rev 
312320)
@@ -633,8 +633,12 @@
        zend_llist *fetch_list_ptr;

        if (varname->op_type == IS_CONST) {
+               ulong hash = 0;
+
                if (Z_TYPE(varname->u.constant) != IS_STRING) {
                        convert_to_string(&varname->u.constant);
+               } else if (IS_INTERNED(Z_STRVAL(varname->u.constant))) {
+                       hash = INTERNED_HASH(Z_STRVAL(varname->u.constant));
                }
                if (!zend_is_auto_global(varname->u.constant.value.str.val, 
varname->u.constant.value.str.len TSRMLS_CC) &&
                    !(varname->u.constant.value.str.len == (sizeof("this")-1) &&
@@ -642,7 +646,7 @@
                    (CG(active_op_array)->last == 0 ||
                     
CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != 
ZEND_BEGIN_SILENCE)) {
                        result->op_type = IS_CV;
-                       result->u.op.var = lookup_cv(CG(active_op_array), 
varname->u.constant.value.str.val, varname->u.constant.value.str.len, 0 
TSRMLS_CC);
+                       result->u.op.var = lookup_cv(CG(active_op_array), 
varname->u.constant.value.str.val, varname->u.constant.value.str.len, hash 
TSRMLS_CC);
                        varname->u.constant.value.str.val = 
CG(active_op_array)->vars[result->u.op.var].name;
                        result->EA = 0;
                        return;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php