diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 03:26:13 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 03:26:13 +0400 |
| commit | 4ecc52797650c882f3101edd7171007ac0d15ec7 (patch) | |
| tree | 8bc98bd380f7efc9b74bf2f50498f9bd2e22f8dc /ext/opcache | |
| parent | 424aebbf3643b3fc1b1074ecddf2104cb9465f02 (diff) | |
| download | php-git-4ecc52797650c882f3101edd7171007ac0d15ec7.tar.gz | |
Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first).
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 4 | ||||
| -rw-r--r-- | ext/opcache/zend_persist.c | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_persist_calc.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index c77a4d0149..3c143de1c1 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -273,7 +273,6 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC) Z_STR_P(src) = zend_clone_str(Z_STR_P(src) TSRMLS_CC); break; case IS_ARRAY: -#if ZEND_EXTENSION_API_NO <= PHP_5_5_X_API_NO case IS_CONSTANT_ARRAY: if (Z_ARR_P(src) != &EG(symbol_table)) { if (bind && Z_REFCOUNT_P(src) > 1 && (ptr = accel_xlat_get(Z_ARR_P(src))) != NULL) { @@ -290,7 +289,6 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC) } } break; -#endif case IS_REFERENCE: if (bind && Z_REFCOUNT_P(src) > 1 && (ptr = accel_xlat_get(Z_REF_P(src))) != NULL) { Z_REF_P(src) = ptr; @@ -304,7 +302,6 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC) zend_clone_zval(Z_REFVAL_P(src), bind TSRMLS_CC); } break; -#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO case IS_CONSTANT_AST: if (bind && Z_REFCOUNT_P(src) > 1 && (ptr = accel_xlat_get(Z_AST_P(src))) != NULL) { Z_AST_P(src) = ptr; @@ -319,7 +316,6 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC) Z_ASTVAL_P(src) = zend_ast_clone(Z_ASTVAL_P(src) TSRMLS_CC); } break; -#endif } } diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 30818adb30..33a99ee9c0 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -140,9 +140,7 @@ static void zend_persist_zval(zval *z TSRMLS_DC) Z_GC_FLAGS_P(z) |= flags; break; case IS_ARRAY: -#if ZEND_EXTENSION_API_NO <= PHP_5_5_API_NO case IS_CONSTANT_ARRAY: -#endif new_ptr = zend_shared_alloc_get_xlat_entry(Z_ARR_P(z)); if (new_ptr) { Z_ARR_P(z) = new_ptr; diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index b6740db044..a347a34cf3 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -127,9 +127,7 @@ static uint zend_persist_zval_calc(zval *z TSRMLS_DC) Z_GC_FLAGS_P(z) |= flags; break; case IS_ARRAY: -#if ZEND_EXTENSION_API_NO <= PHP_5_5_API_NO case IS_CONSTANT_ARRAY: -#endif size = zend_shared_memdup_size(Z_ARR_P(z), sizeof(zend_array)); if (size) { ADD_SIZE(size); |