From 447e57a1e12cdcc6791302d5097119fb2165475a Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 17 Aug 2016 20:26:32 +0200
Subject: Fixed 7.1 build, decls first please!

---
 TSRM/tsrm_win32.c                      | 5 ++---
 Zend/zend_execute.c                    | 2 +-
 Zend/zend_virtual_cwd.c                | 2 +-
 ext/opcache/Optimizer/zend_inference.c | 6 ++++--
 ext/standard/array.c                   | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 7015b3bbb7..b6002bea84 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -208,15 +208,14 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
+	realpath_cache_bucket * bucket = NULL;
+	char * real_path = NULL;
 
 	PHP_WIN32_IOUTIL_INIT_W(pathname)
 	if (!pathw) {
 		return -1;
 	}
 
-	realpath_cache_bucket * bucket = NULL;
-	char * real_path = NULL;
-
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
 		int ret;
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 4676260f41..d2411ad5c3 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -625,8 +625,8 @@ static ZEND_COLD void zend_verify_type_error_common(
 		const char **need_msg, const char **need_kind, const char **need_or_null,
 		const char **given_msg, const char **given_kind)
 {
-	*fname = ZSTR_VAL(zf->common.function_name);
 	zend_bool is_interface = 0;
+	*fname = ZSTR_VAL(zf->common.function_name);
 
 	if (zf->common.scope) {
 		*fsep =  "::";
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 7861e95334..bc7826440e 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -299,8 +299,8 @@ CWD_API int php_sys_stat_ex(const char *path, zend_stat_t *buf, int lstat) /* {{
 	WIN32_FILE_ATTRIBUTE_DATA data;
 	LARGE_INTEGER t;
 	const size_t path_len = strlen(path);
-	ALLOCA_FLAG(use_heap_large);
 	wchar_t *pathw = php_win32_ioutil_any_to_w(path);
+	ALLOCA_FLAG(use_heap_large)
 
 	if (!pathw) {
 		return -1;
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index 6f5928e08c..e3bf922a9f 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -3695,12 +3695,14 @@ static zend_bool can_convert_to_double(
 static int zend_type_narrowing(const zend_op_array *op_array, const zend_script *script, zend_ssa *ssa)
 {
 	uint32_t bitset_len = zend_bitset_len(ssa->vars_count);
-	ALLOCA_FLAG(use_heap);
-	zend_bitset visited = ZEND_BITSET_ALLOCA(2 * bitset_len, use_heap);
+	zend_bitset visited = 0;
 	zend_bitset worklist = visited + bitset_len;
 	int i, v;
 	zend_op *opline;
 	zend_bool narrowed = 0;
+	ALLOCA_FLAG(use_heap)
+
+	visited = ZEND_BITSET_ALLOCA(2 * bitset_len, use_heap);
 
 	zend_bitset_clear(worklist, bitset_len);
 
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 848f109494..f471f2a7a4 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -5112,6 +5112,7 @@ PHP_FUNCTION(array_rand)
 	zend_bitset bitset;
 	int negative_bitset = 0;
 	uint32_t bitset_len;
+	ALLOCA_FLAG(use_heap)
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &input, &num_req) == FAILURE) {
 		return;
@@ -5165,7 +5166,6 @@ PHP_FUNCTION(array_rand)
 		num_req = num_avail - num_req;
 	}
 
-	ALLOCA_FLAG(use_heap);
 	bitset_len = zend_bitset_len(num_avail);
 	bitset = ZEND_BITSET_ALLOCA(bitset_len, use_heap);
 	zend_bitset_clear(bitset, bitset_len);
-- 
cgit v1.2.1