- Small fixes

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4c43f2ba2587915a0f846039f694a6c60868c3bf..6d01268412bdc1275a0fa4d708c5fb0e4bdf1d99 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -298,7 +298,6 @@ void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *o
                        *result = last_op->result;
                        break;
                case ZEND_FETCH_DIM_RW:
-#if 1
                        last_op->opcode = op;
                        last_op->extended_value = ZEND_ASSIGN_DIM;
 
@@ -309,7 +308,6 @@ void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *o
                        SET_UNUSED(opline->result);
                        *result = last_op->result;
                        break;
-#endif
                default:
                        opline->opcode = op;
                        opline->op1 = *op1;

diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 9b3311d62d1da41a16aa730ceb5b0cf3562a9280..d29795e3aa0569cbdc14602b4a12942317df5ecb 100644 (file)
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -25,12 +25,6 @@
 #include "zend_API.h"
 #include "zend_interfaces.h"
 
-static inline void zend_nuke_object(zend_object *object TSRMLS_DC)
-{
-       zend_hash_destroy(object->properties);
-       FREE_HASHTABLE(object->properties);
-       efree(object);
-}
 
 ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC)
 {
@@ -46,7 +40,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
                                if (object->ce != EG(scope)) {
                                        zend_class_entry *ce = object->ce;
 
-                                       zend_nuke_object(object TSRMLS_CC); /* unfortunately we *must* destroy it now anyway */
                                        zend_error(EG(in_execution) ? E_ERROR : E_WARNING, 
                                                "Call to private %s::__destruct() from context '%s'%s", 
                                                ce->name, 
@@ -60,7 +53,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
                                if (!zend_check_protected(destructor->common.scope, EG(scope))) {
                                        zend_class_entry *ce = object->ce;
 
-                                       zend_nuke_object(object TSRMLS_CC); /* unfortunately we *must* destroy it now anyway */
                                        zend_error(EG(in_execution) ? E_ERROR : E_WARNING, 
                                                "Call to protected %s::__destruct() from context '%s'%s", 
                                                ce->name, 
@@ -82,7 +74,9 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 
 ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)
 {
-       zend_nuke_object(object TSRMLS_CC);
+       zend_hash_destroy(object->properties);
+       FREE_HASHTABLE(object->properties);
+       efree(object);
 }
 
 ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC)