Reorder fields for better alignment on both 32-bit and 64-bit systems

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 55100ac5ecb8fdef7e6c01ecae886ce3d251309a..089c15f48a94d4dce32c9af8f069ea2f5dcc7a12 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -360,11 +360,11 @@ struct _zend_execute_data {
        zend_execute_data   *call;             /* current call                   */
        void               **run_time_cache;
        zend_function       *func;             /* executed op_array              */
-       uint32_t             num_args;
-       uint32_t             frame_info;
-       zend_class_entry    *called_scope;
        zval                 This;
+       zend_class_entry    *called_scope;
        zend_execute_data   *prev_execute_data;
+       uint32_t             frame_info;
+       uint32_t             num_args;
        zval                *return_value;
        zend_class_entry    *scope;            /* function scope (self)          */
        zend_array          *symbol_table;

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index a17af14da0d761a8ee046803cbfb08b4290d66aa..9c620864dd03a1af070eb8d5066a9c45a39ac30d 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -215,11 +215,11 @@ static zend_always_inline zend_execute_data *zend_vm_stack_push_call_frame(uint3
        }
        call = (zend_execute_data*)zend_vm_stack_alloc(used_stack * sizeof(zval) TSRMLS_CC);
        call->func = func;
-       call->num_args = 0;
-       call->frame_info = frame_info;
-       call->called_scope = called_scope;
        ZVAL_OBJ(&call->This, object);
+       call->called_scope = called_scope;
        call->prev_execute_data = prev;
+       call->frame_info = frame_info;
+       call->num_args = 0;
        return call;
 }