php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use better data structures (incomplete)

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-18 17:31:27 +04:00
parent 246d50fd95
commit 9e6c0c6a89
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend.h
+5 -3
View File
@@ -711,9 +711,11 @@ END_EXTERN_C()
#define COPY_PZVAL_TO_ZVAL(zv, pzv) \
ZVAL_COPY_VALUE(&(zv), (pzv)); \
if (Z_REFCOUNT_P(pzv)>1) { \
zval_copy_ctor(&(zv)); \
Z_DELREF_P((pzv)); \
if (IS_REFCOUNTED(Z_TYPE_P(pzv))) { \
if (Z_REFCOUNT_P(pzv)>1) { \
zval_copy_ctor(&(zv)); \
Z_DELREF_P((pzv)); \
} \
} \
#define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) { \
Zend/zend_builtin_functions.c
+1 -1
View File
@@ -468,7 +468,7 @@ ZEND_FUNCTION(func_get_args)
arg = p-(arg_count-i);
if (!Z_ISREF_P(arg)) {
element = arg;
Z_ADDREF_P(element);
if (IS_REFCOUNTED(Z_TYPE_P(element))) Z_ADDREF_P(element);
} else {
ZVAL_DUP(&tmp, Z_REFVAL_P(arg));
element = &tmp;
Zend/zend_execute_API.c
+9 -8
View File
@@ -738,7 +738,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
zend_fcall_info_cache fci_cache_local;
zval tmp;
fci->retval = NULL;
ZVAL_UNDEF(fci->retval);
if (!EG(active)) {
return FAILURE; /* executor is already inactive */
@@ -802,7 +802,11 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
calling_scope = fci_cache->calling_scope;
called_scope = fci_cache->called_scope;
fci->object_ptr = fci_cache->object_ptr;
ZVAL_COPY_VALUE(&EX(object), fci->object_ptr);
if (fci->object_ptr) {
ZVAL_COPY_VALUE(&EX(object), fci->object_ptr);
} else {
ZVAL_UNDEF(&EX(object));
}
if (fci->object_ptr && Z_TYPE_P(fci->object_ptr) == IS_OBJECT &&
(!EG(objects_store).object_buckets ||
!IS_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(fci->object_ptr)]))) {
@@ -859,12 +863,9 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
(EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0 ) {
param = &tmp;
ZVAL_DUP(param, &fci->params[i]);
//??? } else if (*fci->params[i] != &EG(uninitialized_zval)) {
Z_ADDREF(fci->params[i]);
param = &fci->params[i];
//??? } else {
//??? param = &tmp;
//??? ZVAL_COPY_VALUE(param, &fci->params[i]);
} else {
param = &tmp;
ZVAL_COPY(param, &fci->params[i]);
}
zend_vm_stack_push(param TSRMLS_CC);
}