diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-11-23 23:50:47 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-11-23 23:50:47 +0100 |
| commit | 38229d13d14bb0bda736d52a9a4f25c121445692 (patch) | |
| tree | f2107a9a06435d6e4186c4c7eb5ad517ce4d28b7 /Zend/zend_compile.c | |
| parent | 77f172725a37c8ddee750bf6970529a1570fbc86 (diff) | |
| parent | 5ef138b0c7c4e9532e205f45c18a72aa1d279c24 (diff) | |
| download | php-git-38229d13d14bb0bda736d52a9a4f25c121445692.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
Zend/zend_compile.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d15b85fc0b..ee3aa75ad1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3831,11 +3831,15 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) /* {{{ */ arg_info->class_name_len = 0; if (type_ast) { - zend_bool has_null_default = default_ast - && (Z_TYPE(default_node.u.constant) == IS_NULL - || (Z_TYPE(default_node.u.constant) == IS_CONSTANT - && strcasecmp(Z_STRVAL(default_node.u.constant), "NULL") == 0) - || Z_TYPE(default_node.u.constant) == IS_CONSTANT_AST); // ??? + zend_bool has_null_default = 0; + + if (default_ast) { + if (!(has_null_default = (Z_TYPE(default_node.u.constant) == IS_NULL || (Z_TYPE(default_node.u.constant) == IS_CONSTANT && strcasecmp(Z_STRVAL(default_node.u.constant), "NULL") == 0)))) { + if (Z_OPT_CONSTANT(default_node.u.constant)) { + has_null_default = 2; + } + } + } op_array->fn_flags |= ZEND_ACC_HAS_TYPE_HINTS; arg_info->allow_null = has_null_default; |