com php-src: Reorder fields for better alignment on both 32-bit and 64-bit systems: Zend/zend_compile.h Zend/zend_execute.h

Commit: 75b5dc63695775f6b7a5aa862efbc9766ce642d2 Author: Dmitry Stogov <dmitry@zend.com> Tue, 7 Oct 2014 18:12:09 +0400 Parents: 67be34ec95d48d7b5ce85200f96ce05e8d409f99 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75b5dc63695775f6b7a5aa862efbc9766ce642d2 Log: Reorder fields for better alignment on both 32-bit and 64-bit systems Changed paths: M Zend/zend_compile.h M Zend/zend_execute.h Diff: diff --git a/Zend/zend_compile..h b/Zend/zend_compile.h index 55100ac..089c15f 100644 --- 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 a17af14..9c62086 100644 --- 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; }