From 4bbf200b4ee92f771868037b49ae1f4d0fed5aec Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 15 Mar 2018 15:40:04 +0300 Subject: Optmized AST creation --- Zend/zend_ast.h | 94 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 23 deletions(-) (limited to 'Zend/zend_ast.h') diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index a9b45ab080..900c1b6562 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -25,6 +25,10 @@ #include "zend.h" +#ifndef ZEND_AST_SPEC +# define ZEND_AST_SPEC 1 +#endif + #define ZEND_AST_SPECIAL_SHIFT 6 #define ZEND_AST_IS_LIST_SHIFT 7 #define ZEND_AST_NUM_CHILDREN_SHIFT 8 @@ -191,26 +195,84 @@ typedef struct _zend_ast_decl { typedef void (*zend_ast_process_t)(zend_ast *ast); extern ZEND_API zend_ast_process_t zend_ast_process; -ZEND_API zend_ast *zend_ast_create_zval_with_lineno(zval *zv, zend_ast_attr attr, uint32_t lineno); -ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_with_lineno(zval *zv, uint32_t lineno); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval(zval *zv); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_from_str(zend_string *str); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_from_long(zend_long lval); + +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_constant(zend_string *name, zend_ast_attr attr); + +#if ZEND_AST_SPEC +# define ZEND_AST_SPEC_CALL(name, ...) \ + ZEND_AST_SPEC_CALL_(name, __VA_ARGS__, _4, _3, _2, _1, _0)(__VA_ARGS__) +# define ZEND_AST_SPEC_CALL_(name, _, _4, _3, _2, _1, suffix, ...) \ + name ## suffix +# define ZEND_AST_SPEC_CALL_EX(name, ...) \ + ZEND_AST_SPEC_CALL_EX_(name, __VA_ARGS__, _4, _3, _2, _1, _0)(__VA_ARGS__) +# define ZEND_AST_SPEC_CALL_EX_(name, _, _5, _4, _3, _2, _1, suffix, ...) \ + name ## suffix + +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_0(zend_ast_kind kind); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_1(zend_ast_kind kind, zend_ast *child); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_2(zend_ast_kind kind, zend_ast *child1, zend_ast *child2); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_3(zend_ast_kind kind, zend_ast *child1, zend_ast *child2, zend_ast *child3); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_4(zend_ast_kind kind, zend_ast *child1, zend_ast *child2, zend_ast *child3, zend_ast *child4); + +static zend_always_inline zend_ast * zend_ast_create_ex_0(zend_ast_kind kind, zend_ast_attr attr) { + zend_ast *ast = zend_ast_create_0(kind); + ast->attr = attr; + return ast; +} +static zend_always_inline zend_ast * zend_ast_create_ex_1(zend_ast_kind kind, zend_ast_attr attr, zend_ast *child) { + zend_ast *ast = zend_ast_create_1(kind, child); + ast->attr = attr; + return ast; +} +static zend_always_inline zend_ast * zend_ast_create_ex_2(zend_ast_kind kind, zend_ast_attr attr, zend_ast *child1, zend_ast *child2) { + zend_ast *ast = zend_ast_create_2(kind, child1, child2); + ast->attr = attr; + return ast; +} +static zend_always_inline zend_ast * zend_ast_create_ex_3(zend_ast_kind kind, zend_ast_attr attr, zend_ast *child1, zend_ast *child2, zend_ast *child3) { + zend_ast *ast = zend_ast_create_3(kind, child1, child2, child3); + ast->attr = attr; + return ast; +} +static zend_always_inline zend_ast * zend_ast_create_ex_4(zend_ast_kind kind, zend_ast_attr attr, zend_ast *child1, zend_ast *child2, zend_ast *child3, zend_ast *child4) { + zend_ast *ast = zend_ast_create_4(kind, child1, child2, child3, child4); + ast->attr = attr; + return ast; +} + +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_list_0(zend_ast_kind kind); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_list_1(zend_ast_kind kind, zend_ast *child); +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_list_2(zend_ast_kind kind, zend_ast *child1, zend_ast *child2); -ZEND_API zend_ast *zend_ast_create_constant(zend_string *name, zend_ast_attr attr); +# define zend_ast_create(...) \ + ZEND_AST_SPEC_CALL(zend_ast_create, __VA_ARGS__) +# define zend_ast_create_ex(...) \ + ZEND_AST_SPEC_CALL_EX(zend_ast_create_ex, __VA_ARGS__) +# define zend_ast_create_list(init_children, ...) \ + ZEND_AST_SPEC_CALL(zend_ast_create_list, __VA_ARGS__) -ZEND_API zend_ast *zend_ast_create_ex(zend_ast_kind kind, zend_ast_attr attr, ...); +#else ZEND_API zend_ast *zend_ast_create(zend_ast_kind kind, ...); +ZEND_API zend_ast *zend_ast_create_ex(zend_ast_kind kind, zend_ast_attr attr, ...); +ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind kind, ...); +#endif + +ZEND_API zend_ast * ZEND_FASTCALL zend_ast_list_add(zend_ast *list, zend_ast *op); ZEND_API zend_ast *zend_ast_create_decl( zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment, zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2, zend_ast *child3 ); -ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind kind, ...); -ZEND_API zend_ast *zend_ast_list_add(zend_ast *list, zend_ast *op); - -ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope); +ZEND_API int ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope); ZEND_API zend_string *zend_ast_export(const char *prefix, zend_ast *ast, const char *suffix); -ZEND_API zend_ast_ref *zend_ast_copy(zend_ast *ast); +ZEND_API zend_ast_ref * ZEND_FASTCALL zend_ast_copy(zend_ast *ast); ZEND_API void ZEND_FASTCALL zend_ast_destroy(zend_ast *ast); ZEND_API void ZEND_FASTCALL zend_ast_ref_destroy(zend_ast_ref *ast); @@ -254,20 +316,6 @@ static zend_always_inline uint32_t zend_ast_get_lineno(zend_ast *ast) { } } -static zend_always_inline zend_ast *zend_ast_create_zval(zval *zv) { - return zend_ast_create_zval_ex(zv, 0); -} -static zend_always_inline zend_ast *zend_ast_create_zval_from_str(zend_string *str) { - zval zv; - ZVAL_STR(&zv, str); - return zend_ast_create_zval(&zv); -} -static zend_always_inline zend_ast *zend_ast_create_zval_from_long(zend_long lval) { - zval zv; - ZVAL_LONG(&zv, lval); - return zend_ast_create_zval(&zv); -} - static zend_always_inline zend_ast *zend_ast_create_binary_op(uint32_t opcode, zend_ast *op0, zend_ast *op1) { return zend_ast_create_ex(ZEND_AST_BINARY_OP, opcode, op0, op1); } -- cgit v1.2.1