com php-src: fixes after merging master: Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:02:34 +0000 |
| Subject: | com php-src: fixes after merging master: Zend/zend_vm_def .h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73497@lists.php.net to get a copy of this message | ||
Commit: 646b5d306cb699bd82aeb46bf9f8f989ad62098c
Author: Anatol Belski <ab@php.net> Thu, 18 Jul 2013 03:53:51 -0700
Parents: 6a16702e30e4679379e1ca485322d8024b880400
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=646b5d306cb699bd82aeb46bf9f8f989ad62098c
Log:
fixes after merging master
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d394bd1..caf6611 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2421,7 +2421,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -2541,7 +2541,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS /* do nothing */ } else if (OP2_TYPE != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (OP2_TYPE == IS_CONST) { @@ -4241,7 +4241,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY) zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -4298,7 +4298,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY) zend_object *zobj = zend_objects_get_address(array TSRMLS_CC); int key_type; char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; zend_ulong int_key; fe_ht = Z_OBJPROP_P(array); @@ -4319,7 +4319,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY) ZVAL_LONG(key, int_key); } else { const char *class_name, *prop_name; - zend_str_size prop_name_len; + zend_str_size_int prop_name_len; zend_unmangle_property_name_ex( str_key, str_key_len - 1, &class_name, &prop_name, &prop_name_len ); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2a295b8..1993a6d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2940,7 +2940,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -3629,7 +3629,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER( /* do nothing */ } else if (IS_CONST != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CONST == IS_CONST) { @@ -4618,7 +4618,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE /* do nothing */ } else if (IS_TMP_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_TMP_VAR == IS_CONST) { @@ -5470,7 +5470,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE /* do nothing */ } else if (IS_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_VAR == IS_CONST) { @@ -6184,7 +6184,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER /* do nothing */ } else if (IS_UNUSED != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_UNUSED == IS_CONST) { @@ -7040,7 +7040,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN /* do nothing */ } else if (IS_CV != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CV == IS_CONST) { @@ -8243,7 +8243,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -8991,7 +8991,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -9844,7 +9844,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -10698,7 +10698,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -12128,7 +12128,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -13556,7 +13556,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -13613,7 +13613,7 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array TSRMLS_CC); int key_type; char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; zend_ulong int_key; fe_ht = Z_OBJPROP_P(array); @@ -13634,7 +13634,7 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG ZVAL_LONG(key, int_key); } else { const char *class_name, *prop_name; - zend_str_size prop_name_len; + zend_str_size_int prop_name_len; zend_unmangle_property_name_ex( str_key, str_key_len - 1, &class_name, &prop_name, &prop_name_len ); @@ -15353,7 +15353,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -15472,7 +15472,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE /* do nothing */ } else if (IS_CONST != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CONST == IS_CONST) { @@ -17688,7 +17688,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -17808,7 +17808,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND /* do nothing */ } else if (IS_TMP_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_TMP_VAR == IS_CONST) { @@ -19982,7 +19982,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -20102,7 +20102,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND /* do nothing */ } else if (IS_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_VAR == IS_CONST) { @@ -21528,7 +21528,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z /* do nothing */ } else if (IS_UNUSED != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_UNUSED == IS_CONST) { @@ -23418,7 +23418,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -23537,7 +23537,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_ /* do nothing */ } else if (IS_CV != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CV == IS_CONST) { @@ -25039,7 +25039,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -26445,7 +26445,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -27755,7 +27755,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -29488,7 +29488,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -31072,7 +31072,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -32727,7 +32727,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -34828,7 +34828,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -36984,7 +36984,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -40135,7 +40135,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d394bd1..caf6611 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2421,7 +2421,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -2541,7 +2541,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS /* do nothing */ } else if (OP2_TYPE != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (OP2_TYPE == IS_CONST) { @@ -4241,7 +4241,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY) zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -4298,7 +4298,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY) zend_object *zobj = zend_objects_get_address(array TSRMLS_CC); int key_type; char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; zend_ulong int_key; fe_ht = Z_OBJPROP_P(array); @@ -4319,7 +4319,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY) ZVAL_LONG(key, int_key); } else { const char *class_name, *prop_name; - zend_str_size prop_name_len; + zend_str_size_int prop_name_len; zend_unmangle_property_name_ex( str_key, str_key_len - 1, &class_name, &prop_name, &prop_name_len ); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2a295b8..1993a6d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2940,7 +2940,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -3629,7 +3629,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER( /* do nothing */ } else if (IS_CONST != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CONST == IS_CONST) { @@ -4618,7 +4618,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE /* do nothing */ } else if (IS_TMP_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_TMP_VAR == IS_CONST) { @@ -5470,7 +5470,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE /* do nothing */ } else if (IS_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_VAR == IS_CONST) { @@ -6184,7 +6184,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER /* do nothing */ } else if (IS_UNUSED != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_UNUSED == IS_CONST) { @@ -7040,7 +7040,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN /* do nothing */ } else if (IS_CV != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CV == IS_CONST) { @@ -8243,7 +8243,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -8991,7 +8991,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -9844,7 +9844,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -10698,7 +10698,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -12128,7 +12128,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -13556,7 +13556,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -13613,7 +13613,7 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_object *zobj = zend_objects_get_address(array TSRMLS_CC); int key_type; char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; zend_ulong int_key; fe_ht = Z_OBJPROP_P(array); @@ -13634,7 +13634,7 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG ZVAL_LONG(key, int_key); } else { const char *class_name, *prop_name; - zend_str_size prop_name_len; + zend_str_size_int prop_name_len; zend_unmangle_property_name_ex( str_key, str_key_len - 1, &class_name, &prop_name, &prop_name_len ); @@ -15353,7 +15353,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -15472,7 +15472,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE /* do nothing */ } else if (IS_CONST != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CONST == IS_CONST) { @@ -17688,7 +17688,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -17808,7 +17808,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND /* do nothing */ } else if (IS_TMP_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_TMP_VAR == IS_CONST) { @@ -19982,7 +19982,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1, free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -20102,7 +20102,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND /* do nothing */ } else if (IS_VAR != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; zend_free_op free_op2; if (IS_VAR == IS_CONST) { @@ -21528,7 +21528,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z /* do nothing */ } else if (IS_UNUSED != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_UNUSED == IS_CONST) { @@ -23418,7 +23418,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op1; call_slot *call = EX(call_slots) + opline->result.num; @@ -23537,7 +23537,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_ /* do nothing */ } else if (IS_CV != IS_UNUSED) { char *function_name_strval = NULL; - zend_str_size function_name_strlen = 0; + zend_str_size_int function_name_strlen = 0; if (IS_CV == IS_CONST) { @@ -25039,7 +25039,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -26445,7 +26445,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -27755,7 +27755,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -29488,7 +29488,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -31072,7 +31072,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC); while (zend_hash_has_more_elements(fe_ht) == SUCCESS) { char *str_key; - zend_str_size str_key_len; + zend_str_size_uint str_key_len; ulong int_key; zend_uchar key_type; @@ -32727,7 +32727,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num; @@ -34828,7 +34828,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -36984,7 +36984,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; zend_free_op free_op2; call_slot *call = EX(call_slots) + opline->result.num; @@ -40135,7 +40135,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H USE_OPLINE zval *function_name; char *function_name_strval; - zend_str_size function_name_strlen; + zend_str_size_int function_name_strlen; call_slot *call = EX(call_slots) + opline->result.num;