From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 7 Oct 2014 14:12:09 +0000 (+0400)
Subject: Reorder fields for better alignment on both 32-bit and 64-bit systems
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~79^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75b5dc63695775f6b7a5aa862efbc9766ce642d2;p=php

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 55100ac5ec..089c15f48a 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 a17af14da0..9c620864dd 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;
 }