]> granicus.if.org Git - php/commitdiff
Suppress warning "cast from pointer to integer of different size"
authorXinchen Hui <laruence@php.net>
Tue, 1 Jul 2014 02:36:19 +0000 (10:36 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 1 Jul 2014 02:36:19 +0000 (10:36 +0800)
Zend/zend_compile.c
Zend/zend_opcode.c

index 647fab48be1478f6a3aba72e71f219029431a474..d52a1630678338d0407fed6d749e6985368ca15b 100644 (file)
@@ -308,7 +308,7 @@ static int lookup_cv(zend_op_array *op_array, zend_string* name TSRMLS_DC) /* {{
                     op_array->vars[i]->len == name->len &&
                     memcmp(op_array->vars[i]->val, name->val, name->len) == 0)) {
                        STR_RELEASE(name);
-                       return (int)EX_VAR_NUM_2(NULL, i);
+                       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
                }
                i++;
        }
@@ -320,7 +320,7 @@ static int lookup_cv(zend_op_array *op_array, zend_string* name TSRMLS_DC) /* {{
        }
 
        op_array->vars[i] = zend_new_interned_string(name TSRMLS_CC);
-       return (int)EX_VAR_NUM_2(NULL, i);
+       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
 }
 /* }}} */
 
index cad1dd2e9c09e425bb019caa7c56d97d3b7fc91a..41cfb8904a512300ff13862c7fccc81aa75bf433 100644 (file)
@@ -659,20 +659,20 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
                if (opline->op1_type == IS_CONST) {
                        opline->op1.zv = &op_array->literals[opline->op1.constant];
                } else if (opline->op1_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->op1.var = (zend_uint)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op1.var);
+                       opline->op1.var = (zend_uint)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op1.var);
                }
                if (opline->op2_type == IS_CONST) {
                        opline->op2.zv = &op_array->literals[opline->op2.constant];
                } else if (opline->op2_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->op2.var = (zend_uint)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op2.var);
+                       opline->op2.var = (zend_uint)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op2.var);
                }
                if (opline->result_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->result.var = (zend_uint)EX_VAR_NUM_2(NULL, op_array->last_var + opline->result.var);
+                       opline->result.var = (zend_uint)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->result.var);
                }
                switch (opline->opcode) {
                        case ZEND_DECLARE_INHERITED_CLASS:
                        case ZEND_DECLARE_INHERITED_CLASS_DELAYED:
-                               opline->extended_value = (zend_uint)EX_VAR_NUM_2(NULL, op_array->last_var + opline->extended_value);
+                               opline->extended_value = (zend_uint)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->extended_value);
                                break;
                        case ZEND_GOTO:
                                if (Z_TYPE_P(opline->op2.zv) != IS_LONG) {