com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend_API.c Zend/zend_compile.c Zen d/zend_compile.h Zend/zend_execute.c Zend/zend_vm
_def.h Zend/zend_vm_execute.h ext/date/php_date .c

Commit: 3f7522a652d2c90ca594cdb02b4083ce64213e46 Author: Anatol Belski <ab@php.net> Thu, 28 Nov 2013 09:29:12 +0100 Parents: de453dbef6cc7a0ead22d82871331eb8c15a2b08 98f3c410d9c93e64c4e109b8f55e6d2f5cdabaac Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f7522a652d2c90ca594cdb02b4083ce64213e46 Log: Merge branch 'master' into str_size_and_int64 Changed paths: MM Zend/zend_API.c MM Zend/zend_compile.c MM Zend/zend_compile.h MM Zend/zend_execute.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/date/php_date.c Diff: diff --cc Zend/zend_execute.c index 85b8cd8,5aea39e..aab1dc9 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@@ -1313,9 -1310,9 +1310,9 @@@ static void zend_fetch_dimension_addres Z_STRVAL_P(ptr) = (char*)emalloc(2); Z_STRVAL_P(ptr)[0] = Z_STRVAL_P(container)[Z_LVAL_P(dim)]; Z_STRVAL_P(ptr)[1] = 0; - Z_STRLEN_P(ptr) = 1; + Z_STRSIZE_P(ptr) = 1; } - AI_SET_PTR(result, ptr); + result->var.ptr = ptr; return; } break; diff --cc Zend/zend_vm_def.h index 4640e42,6eca6d0..3821374 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@@ -1962,10 -1951,10 +1951,10 @@@ ZEND_VM_HELPER(zend_do_fcall_common_hel LOAD_OPLINE(); if (fbc->type == ZEND_INTERNAL_FUNCTION) { - if (fbc->common.arg_info) { + if (fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) { zend_uint i=0; zval **p = (zval**)EX(function_state).arguments; - ulong arg_count = opline->extended_value; + zend_uint_t arg_count = opline->extended_value; while (arg_count>0) { zend_verify_arg_type(fbc, ++i, *(p-arg_count), 0 TSRMLS_CC); diff --cc Zend/zend_vm_execute.h index 0a7912b,dcb1183..0e38bb7 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@@ -530,10 -530,10 +530,10 @@@ static int ZEND_FASTCALL zend_do_fcall_ LOAD_OPLINE(); if (fbc->type == ZEND_INTERNAL_FUNCTION) { - if (fbc->common.arg_info) { + if (fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) { zend_uint i=0; zval **p = (zval**)EX(function_state).arguments; - ulong arg_count = opline->extended_value; + zend_uint_t arg_count = opline->extended_value; while (arg_count>0) { zend_verify_arg_type(fbc, ++i, *(p-arg_count), 0 TSRMLS_CC);