Reorder fields for better nenory consumtion and data locality on 64-bit systems

diff --git a/Zend/zend.h b/Zend/zend.h
index 41793d8290f6cdaa6d18b912ac7e9ffbccab7a4c..51de769704ed0b8e505044875bfd471d3b6ae72c 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -476,14 +476,14 @@ struct _zend_class_entry {
        int refcount;
        uint32_t ce_flags;
 
-       HashTable function_table;
-       HashTable properties_info;
+       int default_properties_count;
+       int default_static_members_count;
        zval *default_properties_table;
        zval *default_static_members_table;
        zval *static_members_table;
+       HashTable function_table;
+       HashTable properties_info;
        HashTable constants_table;
-       int default_properties_count;
-       int default_static_members_count;
 
        union _zend_function *constructor;
        union _zend_function *destructor;
@@ -511,11 +511,11 @@ struct _zend_class_entry {
        int (*serialize)(zval *object, unsigned char **buffer, uint32_t *buf_len, zend_serialize_data *data TSRMLS_DC);
        int (*unserialize)(zval *object, zend_class_entry *ce, const unsigned char *buf, uint32_t buf_len, zend_unserialize_data *data TSRMLS_DC);
 
-       zend_class_entry **interfaces;
        uint32_t num_interfaces;
+       uint32_t num_traits;
+       zend_class_entry **interfaces;
        
        zend_class_entry **traits;
-       uint32_t num_traits;
        zend_trait_alias **trait_aliases;
        zend_trait_precedence **trait_precedences;
 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index dad94e721906d5fa051401791f649fa4fa1e70ee..40a59167b1cf6e076e936efd42e2aca0695dd8f3 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5095,7 +5095,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) {
                CG(active_op_array)->try_catch_array[try_catch_offset].finally_op = opnum_jmp + 1;
                CG(active_op_array)->try_catch_array[try_catch_offset].finally_end
                        = get_next_op_number(CG(active_op_array));
-               CG(active_op_array)->has_finally_block = 1;
+               CG(active_op_array)->fn_flags |= ZEND_ACC_HAS_FINALLY_BLOCK;
 
                zend_emit_op(NULL, ZEND_FAST_RET, NULL, NULL TSRMLS_CC);
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 5e45cd791f14590d123c7b9f4129bcaf46612669..4325711dd203c8c1e8d98c80bcb2779a762cd6a4 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -221,15 +221,17 @@ typedef struct _zend_try_catch_element {
 /* function has arguments with type hinting */
 #define ZEND_ACC_HAS_TYPE_HINTS                        0x10000000
 
+/* op_array has finally blocks */
+#define ZEND_ACC_HAS_FINALLY_BLOCK             0x20000000
+
 #define ZEND_CE_IS_TRAIT(ce) (((ce)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT)
 
 char *zend_visibility_string(uint32_t fn_flags);
 
 typedef struct _zend_property_info {
        uint32_t flags;
-       zend_string *name;
-       zend_ulong h;
        int offset;
+       zend_string *name;
        zend_string *doc_comment;
        zend_class_entry *ce;
 } zend_property_info;
@@ -263,9 +265,9 @@ typedef struct _zend_internal_function_info {
 struct _zend_op_array {
        /* Common elements */
        zend_uchar type;
+       uint32_t fn_flags;
        zend_string *function_name;
        zend_class_entry *scope;
-       uint32_t fn_flags;
        zend_function *prototype;
        uint32_t num_args;
        uint32_t required_num_args;
@@ -274,37 +276,34 @@ struct _zend_op_array {
 
        uint32_t *refcount;
 
-       zend_op *opcodes;
+       uint32_t this_var;
+
        uint32_t last;
+       zend_op *opcodes;
 
-       zend_string **vars;
        int last_var;
-
        uint32_t T;
+       zend_string **vars;
 
-       zend_brk_cont_element *brk_cont_array;
        int last_brk_cont;
-
-       zend_try_catch_element *try_catch_array;
        int last_try_catch;
-       zend_bool has_finally_block;
+       zend_brk_cont_element *brk_cont_array;
+       zend_try_catch_element *try_catch_array;
 
        /* static variables support */
        HashTable *static_variables;
 
-       uint32_t this_var;
-
        zend_string *filename;
        uint32_t line_start;
        uint32_t line_end;
        zend_string *doc_comment;
        uint32_t early_binding; /* the linked list of delayed declarations */
 
-       zval *literals;
        int last_literal;
+       zval *literals;
 
-       void **run_time_cache;
        int  last_cache_slot;
+       void **run_time_cache;
 
        void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 };
@@ -316,9 +315,9 @@ struct _zend_op_array {
 typedef struct _zend_internal_function {
        /* Common elements */
        zend_uchar type;
+       uint32_t fn_flags;
        zend_string* function_name;
        zend_class_entry *scope;
-       uint32_t fn_flags;
        zend_function *prototype;
        uint32_t num_args;
        uint32_t required_num_args;
@@ -336,9 +335,9 @@ union _zend_function {
 
        struct {
                zend_uchar type;  /* never used */
+               uint32_t fn_flags;
                zend_string *function_name;
                zend_class_entry *scope;
-               uint32_t fn_flags;
                union _zend_function *prototype;
                uint32_t num_args;
                uint32_t required_num_args;

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index e9312d9743528fa675a2cd152b5cb6ba3e6de5ce..7278fa9533facfd1988aefc3d451a013b62c8081 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -70,9 +70,9 @@ static ZEND_FUNCTION(pass)
 
 static const zend_internal_function zend_pass_function = {
        ZEND_INTERNAL_FUNCTION, /* type              */
+       0,                      /* fn_flags          */
        NULL,                   /* name              */
        NULL,                   /* scope             */
-       0,                      /* fn_flags          */
        NULL,                   /* prototype         */
        0,                      /* num_args          */
        0,                      /* required_num_args */

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 22e512f33ed90fa260a41484faacc9a45b97e14e..449a3746833c7c4e9c85ef930c0088cf584794e7 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -146,7 +146,7 @@ static void zend_generator_dtor_storage(zend_object *object TSRMLS_DC) /* {{{ */
        uint32_t op_num, finally_op_num;
        int i;
 
-       if (!ex || !ex->func->op_array.has_finally_block) {
+       if (!ex || !(ex->func->op_array.fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK)) {
                return;
        }
 

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 872f1f6ecfc98977e1d0a0fcc3ce5cb929511c27..d5c4693b7fb15f6316c869b82887c08a905242a7 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -80,7 +80,6 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz
 
        op_array->static_variables = NULL;
        op_array->last_try_catch = 0;
-       op_array->has_finally_block = 0;
 
        op_array->this_var = -1;
 
@@ -678,7 +677,7 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
        if (!ZEND_USER_CODE(op_array->type)) {
                return 0;
        }
-       if (op_array->has_finally_block) {
+       if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                zend_resolve_finally_calls(op_array TSRMLS_CC);
        }
        if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) {

diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 02763973930e7d083331c10bd1b127341e19c13b..db833fbc538a4cf4f05940601262211bbe6f0c8b 100644 (file)
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1952,7 +1952,7 @@ static void zend_block_optimization(zend_op_array *op_array, zend_optimizer_ctx
        fflush(stderr);
 #endif
 
-       if (op_array->has_finally_block) {
+       if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                return;
        }
 

diff --git a/ext/opcache/Optimizer/pass3.c b/ext/opcache/Optimizer/pass3.c
index 1444fa6d3d238e8606a2a9ba17c434823f0b3e1d..196bdba1805df0bc67fda2dd2ed2a8839392cbd3 100644 (file)
--- a/ext/opcache/Optimizer/pass3.c
+++ b/ext/opcache/Optimizer/pass3.c
@@ -153,7 +153,7 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) {
                                break;
 
                        case ZEND_JMP:
-                               if (op_array->has_finally_block) {
+                               if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                                        break;
                                }
 
@@ -174,7 +174,7 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) {
 
                        case ZEND_JMP_SET:
                        case ZEND_JMP_SET_VAR:
-                               if (op_array->has_finally_block) {
+                               if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                                        break;
                                }
 
@@ -189,7 +189,7 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) {
                                break;
                        case ZEND_JMPZ:
                        case ZEND_JMPNZ:
-                               if (op_array->has_finally_block) {
+                               if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                                        break;
                                }
 
@@ -245,7 +245,7 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) {
                                        zend_uchar T_type = opline->result_type;
                                        znode_op T = opline->result;
 
-                                       if (op_array->has_finally_block) {
+                                       if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                                                break;
                                        }
 
@@ -379,7 +379,7 @@ continue_jmp_ex_optimization:
                                break;
 
                        case ZEND_JMPZNZ:
-                               if (op_array->has_finally_block) {
+                               if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
                                        break;
                                }