archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Drop dead assignments

Browse source
This commit is contained in:
Nikita Popov 2014-09-13 22:21:35 +02:00
parent 21a5253ea9
commit 88e07324d9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_API.c
View file

@ -1303,7 +1303,7 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties
zval_add_ref(&object->properties_table[property_info->offset]);
if (object->properties) {
ZVAL_INDIRECT(&tmp, &object->properties_table[property_info->offset]);
prop = zend_hash_update(object->properties, key, &tmp);
zend_hash_update(object->properties, key, &tmp);
}
} else {
if (!object->properties) {

4
Zend/zend_compile.c
View file

@ -1937,7 +1937,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
ALLOC_HASHTABLE(*overriden);
zend_hash_init_ex(*overriden, 8, NULL, ptr_dtor, 0, 0);
}
fn = zend_hash_update_mem(*overriden, key, fn, sizeof(zend_function));
zend_hash_update_mem(*overriden, key, fn, sizeof(zend_function));
return;
} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure the trait method is compatible with previosly declared abstract method */
@ -4551,7 +4551,7 @@ void zend_compile_new(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */
zend_compile_class_ref(&class_node, class_ast TSRMLS_CC);
opnum = get_next_op_number(CG(active_op_array));
opline = zend_emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC);
zend_emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC);
zend_compile_call_common(&ctor_result, args_ast, NULL TSRMLS_CC);
zend_do_free(&ctor_result TSRMLS_CC);