com php-src: Implement ZEND_TYPE_CHECK optimization: Zend/zend_compile.c Zend/zend_vm_def.h Zend/zend _vm_execute.h

From: Date: Tue, 22 Jul 2014 21:15:47 +0000
Subject: com php-src: Implement ZEND_TYPE_CHECK optimization: Zend/zend_compile.c Zend/zend_vm_def.h Zend/zend _vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80934@lists.php.net to get a copy of this message
Commit: 7892b89465fd0639047d0857a21f6157080b0c5c Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 23:11:12 +0200 Parents: 2ee490ba3abb6cbccb3c8c4eead0f03cf8ceff17 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7892b89465fd0639047d0857a21f6157080b0c5c Log: Implement ZEND_TYPE_CHECK optimization Changed paths: M Zend/zend_compile.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8c217a4..120f029 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4290,10 +4290,57 @@ zend_bool zend_args_contain_unpack(zend_ast *args) { return 0; } -void zend_compile_func_strlen(znode *result, zend_ast *ast TSRMLS_DC) { - znode expr_node; - zend_compile_expr(&expr_node, ast TSRMLS_CC); - emit_op(result, ZEND_STRLEN, &expr_node, NULL TSRMLS_CC); +int zend_compile_func_strlen(znode *result, zend_ast *args_ast TSRMLS_DC) { + znode arg_node; + + if ((CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) + || args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK + ) { + return FAILURE; + } + + zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + emit_op(result, ZEND_STRLEN, &arg_node, NULL TSRMLS_CC); + return SUCCESS; +} + +int zend_compile_func_typecheck(znode *result, zend_ast *args_ast, zend_uint type TSRMLS_DC) { + znode arg_node; + zend_op *opline; + + if (args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK) { + return FAILURE; + } + + zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + opline = emit_op(result, ZEND_TYPE_CHECK, &arg_node, NULL TSRMLS_CC); + opline->extended_value = type; + return SUCCESS; +} + +int zend_try_compile_special_func( + znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC +) { + if (zend_str_equals(lcname, "strlen")) { + return zend_compile_func_strlen(result, args_ast TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_null")) { + return zend_compile_func_typecheck(result, args_ast, IS_NULL TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_bool")) { + return zend_compile_func_typecheck(result, args_ast, _IS_BOOL TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_long")) { + return zend_compile_func_typecheck(result, args_ast, IS_LONG TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_float")) { + return zend_compile_func_typecheck(result, args_ast, IS_DOUBLE TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_string")) { + return zend_compile_func_typecheck(result, args_ast, IS_STRING TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_array")) { + return zend_compile_func_typecheck(result, args_ast, IS_ARRAY TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_object")) { + return zend_compile_func_typecheck(result, args_ast, IS_OBJECT TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_resource")) { + return zend_compile_func_typecheck(result, args_ast, IS_RESOURCE TSRMLS_CC); + } + return FAILURE; } void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -4324,15 +4371,10 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); - if (zend_str_equals(lcname, "strlen")) { - if (!(CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) - && args_ast->children == 1 && args_ast->child[0]->kind != ZEND_AST_UNPACK - ) { - STR_FREE(lcname); - zval_ptr_dtor(&name_node.u.constant); - zend_compile_func_strlen(result, args_ast->child[0] TSRMLS_CC); - return; - } + if (zend_try_compile_special_func(result, lcname, args_ast TSRMLS_CC) == SUCCESS) { + STR_FREE(lcname); + zval_ptr_dtor(&name_node.u.constant); + return; } if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c89b6ad..f45882e 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5936,8 +5936,8 @@ ZEND_VM_HANDLER(123, ZEND_TYPE_CHECK, CONST|TMP|VAR|CV, ANY) } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } FREE_OP1(); CHECK_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 8cc2ca8..263f729 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3438,8 +3438,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } CHECK_EXCEPTION(); @@ -10201,8 +10201,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_A } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } zval_dtor(free_op1.var); CHECK_EXCEPTION(); @@ -16960,8 +16960,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_A } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } zval_ptr_dtor_nogc(free_op1.var); CHECK_EXCEPTION(); @@ -34161,8 +34161,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_AR } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } CHECK_EXCEPTION();

« previous php.cvs (#80934) next »