com php-src: Suppress warning "cast from pointer to integer of different size": Zend/zend_compile.c Zend/zend_opcode.c

Commit: 1d1226afa2bef939767a244c7d831c52d9b21fc1 Author: Xinchen Hui <laruence@php.net> Tue, 1 Jul 2014 10:36:19 +0800 Parents: 42bfa2382ce4461c34c1b1c169ae0ac7c68a5170 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1d1226afa2bef939767a244c7d831c52d9b21fc1 Log: Suppress warning "cast from pointer to integer of different size" Changed paths: M Zend/zend_compile.c M Zend/zend_opcode.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 647fab4..d52a163 100644 --- a/Zend/zend_compile..c +++ b/Zend/zend_compile.c @@ -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); } /* }}} */ diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index cad1dd2..41cfb89 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -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) {