Changeset 187

Timestamp:

03/17/06 14:47:29 (2 years ago)

Author:

hans

Message:

* Fix for sf.net bug #1442839 (handling of ZEND_ASSIGN_OBJ by the optimizer)
* Changed BRK handling to not bail out of the optimizer prematurely on a multi-level break. This does need some more testing, but should fix sf.net bug #1442923
* Removed some dead code in ea_store.c and excluded some debug code from compilation in optimize.c

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_store.c (modified) (1 diff)
• eaccelerator/trunk/optimize.c (modified) (4 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-03-17  Hans Rakers <hans at parse dot nl>
+
+        * Fix for sf.net bug #1442839 (handling of ZEND_ASSIGN_OBJ by the
+          optimizer)
+        * Changed BRK handling to not bail out of the optimizer prematurely
+          on a multi-level break. This does need some more testing, but
+          should fix sf.net bug #1442923
+        * Removed some dead code in ea_store.c and excluded some debug code
+          from compilation in optimize.c
+
-2006-03-09  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/ea_store.c

@@ -906 +906 @@
-                store_hash(to->static_members, from->static_members, (store_bucket_t) store_zval_ptr, (check_bucket_t) store_static_member_access_check, from);
-        }       
-#  else
-        /* for php < 5.0 */
-        if (from->static_members != NULL) {
-                EACCELERATOR_ALIGN(EAG(mem));
-                to->static_members = (HashTable *) EAG(mem);
-                EAG(mem) += sizeof(HashTable);
-                store_zval_hash(to->static_members, from->static_members);
-        }
-#  endif
-#else

eaccelerator/trunk/optimize.c

@@ -63 +63 @@
-} BBlink;
-
+#if 0
-static void dump_bb(BB* bb, zend_op_array *op_array) {
-  BB* p = bb;
@@ -167 +168 @@
-   zend_printf("<br>\n");
-}
+#endif
-
-#define SET_TO_NOP(op) \
@@ -313 +315 @@
-             case ZEND_INIT_STATIC_METHOD_CALL:
-             case ZEND_ASSIGN_DIM:
+             case ZEND_ASSIGN_OBJ:
-             case ZEND_DECLARE_CLASS:
-             case ZEND_DECLARE_INHERITED_CLASS:
@@ -2818 +2821 @@
-                                                        op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE))
-                                                {
-goto brk_failed
+break
-                                                }
-                                                offset = jmp_to->parent;