Fixed 7.1 build, decls first please!

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 7015b3bbb724243c7d0a1d9fd797f63588035b59..b6002bea84b1dd0552eb4a38e89a61f43eb82c26 100644 (file)
--- 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 4676260f41fe8380dbf596885e7701a00e314fcf..d2411ad5c3be30c98c644011ee3815772eb3a921 100644 (file)
--- 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 7861e9533411af43fb65eee2d8b884eac7a747ff..bc7826440eb11340222dedc4c3c3cf05c66dfe10 100644 (file)
--- 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 6f5928e08c3a1acbe9636ad16b87bcd0e7ceea76..e3bf922a9fb5611e4b7cf922733b568a5e68fd94 100644 (file)
--- 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 848f109494dfdca795e6160c385ad824ce4f49c2..f471f2a7a49740f7bf7dd1a7f6bdeef16edd913b 100644 (file)
--- 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);