Skip to content

Commit 42cb293

Browse files
dstogovdstogov
committed
Merge branch 'master' into jit-dynasm
* master: Changed zend_ast_ref structure to use only one allocation, removing dichotomy between heap/arena ASTs. Fix array access on undeclared properties in DateInterval Fix ftok() multibyte path support Use zval_ptr_dtor_nogc() in places where circular zvals are not possible
2 parents 87ebd12 + 39ded1d commit 42cb293

16 files changed

+238
-139
lines changed

‎UPGRADING.INTERNALS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PHP 7.2 INTERNALS UPGRADE NOTES
1313
j. Run-time constant operand addressing
1414
k. Array/Object recursion protection
1515
l. HASH_FLAG_PERSISTENT
16+
m. zend_ast_ref
1617

1718
2. Build system changes
1819
a. Unix build system changes
@@ -88,6 +89,11 @@ PHP 7.2 INTERNALS UPGRADE NOTES
8889
l. HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into
8990
GC_FLAGS (to be consistent with IS_STR_PERSISTENT).
9091

92+
m. zend_ast_ref structure is changed to use only one allocation.
93+
zend_ast_copy() now returns zend_ast_ref (instead of zend_asr).
94+
zend_ast_destroy_and_free() is removed. ZVAL_NEW_AST() is replaced
95+
by ZVAL_AST().
96+
9197
========================
9298
2. Build system changes
9399
========================

‎Zend/zend_ast.c‎

Lines changed: 71 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -451,40 +451,92 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
451451
return ret;
452452
}
453453

454-
ZEND_API zend_ast *zend_ast_copy(zend_ast *ast)
454+
static size_t zend_ast_tree_size(zend_ast *ast)
455455
{
456-
if (ast == NULL) {
457-
return NULL;
458-
} else if (ast->kind == ZEND_AST_ZVAL) {
459-
zend_ast_zval *new = emalloc(sizeof(zend_ast_zval));
456+
size_t size;
457+
458+
if (ast->kind == ZEND_AST_ZVAL) {
459+
size = sizeof(zend_ast_zval);
460+
} else if (zend_ast_is_list(ast)) {
461+
uint32_t i;
462+
zend_ast_list *list = zend_ast_get_list(ast);
463+
464+
size = zend_ast_list_size(list->children);
465+
for (i = 0; i < list->children; i++) {
466+
if (list->child[i]) {
467+
size += zend_ast_tree_size(list->child[i]);
468+
}
469+
}
470+
} else {
471+
uint32_t i, children = zend_ast_get_num_children(ast);
472+
473+
size = zend_ast_size(children);
474+
for (i = 0; i < children; i++) {
475+
if (ast->child[i]) {
476+
size += zend_ast_tree_size(ast->child[i]);
477+
}
478+
}
479+
}
480+
return size;
481+
}
482+
483+
static void* zend_ast_tree_copy(zend_ast *ast, void *buf)
484+
{
485+
if (ast->kind == ZEND_AST_ZVAL) {
486+
zend_ast_zval *new = (zend_ast_zval*)buf;
460487
new->kind = ZEND_AST_ZVAL;
461488
new->attr = ast->attr;
462489
ZVAL_COPY(&new->val, zend_ast_get_zval(ast));
463-
return (zend_ast *) new;
490+
buf = (void*)((char*)buf + sizeof(zend_ast_zval));
464491
} else if (zend_ast_is_list(ast)) {
465492
zend_ast_list *list = zend_ast_get_list(ast);
466-
zend_ast_list *new = emalloc(zend_ast_list_size(list->children));
493+
zend_ast_list *new = (zend_ast_list*)buf;
467494
uint32_t i;
468495
new->kind = list->kind;
469496
new->attr = list->attr;
470497
new->children = list->children;
498+
buf = (void*)((char*)buf + zend_ast_list_size(list->children));
471499
for (i = 0; i < list->children; i++) {
472-
new->child[i] = zend_ast_copy(list->child[i]);
500+
if (list->child[i]) {
501+
new->child[i] = (zend_ast*)buf;
502+
buf = zend_ast_tree_copy(list->child[i], buf);
503+
} else {
504+
new->child[i] = NULL;
505+
}
473506
}
474-
return (zend_ast *) new;
475507
} else {
476508
uint32_t i, children = zend_ast_get_num_children(ast);
477-
zend_ast *new = emalloc(zend_ast_size(children));
509+
zend_ast *new = (zend_ast*)buf;
478510
new->kind = ast->kind;
479511
new->attr = ast->attr;
512+
buf = (void*)((char*)buf + zend_ast_size(children));
480513
for (i = 0; i < children; i++) {
481-
new->child[i] = zend_ast_copy(ast->child[i]);
514+
if (ast->child[i]) {
515+
new->child[i] = (zend_ast*)buf;
516+
buf = zend_ast_tree_copy(ast->child[i], buf);
517+
} else {
518+
new->child[i] = NULL;
519+
}
482520
}
483-
return new;
484521
}
522+
return buf;
485523
}
486524

487-
static void zend_ast_destroy_ex(zend_ast *ast, zend_bool free) {
525+
ZEND_API zend_ast_ref *zend_ast_copy(zend_ast *ast)
526+
{
527+
size_t tree_size;
528+
zend_ast_ref *ref;
529+
530+
ZEND_ASSERT(ast != NULL);
531+
tree_size = zend_ast_tree_size(ast) + sizeof(zend_ast_ref);
532+
ref = emalloc(tree_size);
533+
zend_ast_tree_copy(ast, GC_AST(ref));
534+
GC_REFCOUNT(ref) = 1;
535+
GC_TYPE_INFO(ref) = IS_CONSTANT_AST;
536+
return ref;
537+
}
538+
539+
ZEND_API void zend_ast_destroy(zend_ast *ast) {
488540
if (!ast) {
489541
return;
490542
}
@@ -508,37 +560,26 @@ static void zend_ast_destroy_ex(zend_ast *ast, zend_bool free) {
508560
if (decl->doc_comment) {
509561
zend_string_release(decl->doc_comment);
510562
}
511-
zend_ast_destroy_ex(decl->child[0], free);
512-
zend_ast_destroy_ex(decl->child[1], free);
513-
zend_ast_destroy_ex(decl->child[2], free);
514-
zend_ast_destroy_ex(decl->child[3], free);
563+
zend_ast_destroy(decl->child[0]);
564+
zend_ast_destroy(decl->child[1]);
565+
zend_ast_destroy(decl->child[2]);
566+
zend_ast_destroy(decl->child[3]);
515567
break;
516568
}
517569
default:
518570
if (zend_ast_is_list(ast)) {
519571
zend_ast_list *list = zend_ast_get_list(ast);
520572
uint32_t i;
521573
for (i = 0; i < list->children; i++) {
522-
zend_ast_destroy_ex(list->child[i], free);
574+
zend_ast_destroy(list->child[i]);
523575
}
524576
} else {
525577
uint32_t i, children = zend_ast_get_num_children(ast);
526578
for (i = 0; i < children; i++) {
527-
zend_ast_destroy_ex(ast->child[i], free);
579+
zend_ast_destroy(ast->child[i]);
528580
}
529581
}
530582
}
531-
532-
if (free) {
533-
efree(ast);
534-
}
535-
}
536-
537-
ZEND_API void zend_ast_destroy(zend_ast *ast) {
538-
zend_ast_destroy_ex(ast, 0);
539-
}
540-
ZEND_API void zend_ast_destroy_and_free(zend_ast *ast) {
541-
zend_ast_destroy_ex(ast, 1);
542583
}
543584

544585
ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn) {

‎Zend/zend_ast.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,8 @@ ZEND_API zend_ast *zend_ast_list_add(zend_ast *list, zend_ast *op);
206206
ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope);
207207
ZEND_API zend_string *zend_ast_export(const char *prefix, zend_ast *ast, const char *suffix);
208208

209-
ZEND_API zend_ast *zend_ast_copy(zend_ast *ast);
209+
ZEND_API zend_ast_ref *zend_ast_copy(zend_ast *ast);
210210
ZEND_API void zend_ast_destroy(zend_ast *ast);
211-
ZEND_API void zend_ast_destroy_and_free(zend_ast *ast);
212211

213212
typedef void (*zend_ast_apply_func)(zend_ast **ast_ptr);
214213
ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn);

‎Zend/zend_compile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8040,7 +8040,7 @@ void zend_const_expr_to_zval(zval *result, zend_ast *ast) /* {{{ */
80408040
if (ast->kind == ZEND_AST_ZVAL) {
80418041
ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast));
80428042
} else {
8043-
ZVAL_NEW_AST(result, zend_ast_copy(ast));
8043+
ZVAL_AST(result, zend_ast_copy(ast));
80448044
/* destroy the ast here, it might have been replaced */
80458045
zend_ast_destroy(ast);
80468046
}

‎Zend/zend_execute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ static int is_null_constant(zend_class_entry *scope, zval *default_value)
739739
if (Z_TYPE(constant) == IS_NULL) {
740740
return 1;
741741
}
742-
zval_ptr_dtor(&constant);
742+
zval_ptr_dtor_nogc(&constant);
743743
}
744744
return 0;
745745
}

‎Zend/zend_execute_API.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void shutdown_executor(void) /* {{{ */
333333
if (c->flags & CONST_PERSISTENT) {
334334
break;
335335
}
336-
zval_ptr_dtor(&c->value);
336+
zval_ptr_dtor_nogc(&c->value);
337337
if (c->name) {
338338
zend_string_release(c->name);
339339
}
@@ -623,7 +623,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */
623623
return FAILURE;
624624
}
625625
if (inline_change) {
626-
zval_ptr_dtor(p);
626+
zval_ptr_dtor_nogc(p);
627627
}
628628
ZVAL_COPY_VALUE(p, &tmp);
629629
}

‎Zend/zend_opcode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ ZEND_API void destroy_zend_class(zval *zv)
291291

292292
ZEND_HASH_FOREACH_PTR(&ce->constants_table, c) {
293293
if (c->ce == ce) {
294-
zval_ptr_dtor(&c->value);
294+
zval_ptr_dtor_nogc(&c->value);
295295
if (c->doc_comment) {
296296
zend_string_release(c->doc_comment);
297297
}

‎Zend/zend_types.h‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ struct _zend_reference {
355355

356356
struct _zend_ast_ref {
357357
zend_refcounted_h gc;
358-
zend_ast *ast;
358+
/*zend_ast ast; zend_ast follows the zend_ast_ref structure */
359359
};
360360

361361
/* regular data types */
@@ -635,7 +635,9 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) {
635635
#define Z_AST(zval) (zval).value.ast
636636
#define Z_AST_P(zval_p) Z_AST(*(zval_p))
637637

638-
#define Z_ASTVAL(zval) (zval).value.ast->ast
638+
#define GC_AST(p) ((zend_ast*)(((char*)p) + sizeof(zend_ast_ref)))
639+
640+
#define Z_ASTVAL(zval) GC_AST(Z_AST(zval))
639641
#define Z_ASTVAL_P(zval_p) Z_ASTVAL(*(zval_p))
640642

641643
#define Z_INDIRECT(zval) (zval).value.zv
@@ -818,14 +820,9 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) {
818820
Z_TYPE_INFO_P(z) = IS_REFERENCE_EX; \
819821
} while (0)
820822

821-
#define ZVAL_NEW_AST(z, a) do { \
823+
#define ZVAL_AST(z, ast) do { \
822824
zval *__z = (z); \
823-
zend_ast_ref *_ast = \
824-
(zend_ast_ref *) emalloc(sizeof(zend_ast_ref)); \
825-
GC_REFCOUNT(_ast) = 1; \
826-
GC_TYPE_INFO(_ast) = IS_CONSTANT_AST; \
827-
_ast->ast = (a); \
828-
Z_AST_P(__z) = _ast; \
825+
Z_AST_P(__z) = ast; \
829826
Z_TYPE_INFO_P(__z) = IS_CONSTANT_AST_EX; \
830827
} while (0)
831828

‎Zend/zend_variables.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC
4646
case IS_CONSTANT_AST: {
4747
zend_ast_ref *ast = (zend_ast_ref*)p;
4848

49-
zend_ast_destroy_and_free(ast->ast);
50-
efree_size(ast, sizeof(zend_ast_ref));
49+
zend_ast_destroy(GC_AST(ast));
50+
efree(ast);
5151
break;
5252
}
5353
case IS_OBJECT: {
@@ -174,8 +174,7 @@ ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
174174
CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue));
175175
Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0);
176176
} else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT_AST)) {
177-
zend_ast *copy = zend_ast_copy(Z_ASTVAL_P(zvalue));
178-
ZVAL_NEW_AST(zvalue, copy);
177+
ZVAL_AST(zvalue, zend_ast_copy(Z_ASTVAL_P(zvalue)));
179178
}
180179
}
181180

‎Zend/zend_vm_def.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC(
20462046
(Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
20472047
zend_object *obj;
20482048

2049-
zval_ptr_dtor(object);
2049+
zval_ptr_dtor_nogc(object);
20502050
object_init(object);
20512051
Z_ADDREF_P(object);
20522052
obj = Z_OBJ_P(object);
@@ -4679,7 +4679,7 @@ ZEND_VM_HOT_HANDLER(64, ZEND_RECV_INIT, NUM, CONST)
46794679
if (Z_OPT_CONSTANT_P(param)) {
46804680
SAVE_OPLINE();
46814681
if (UNEXPECTED(zval_update_constant_ex(param, EX(func)->op_array.scope) != SUCCESS)) {
4682-
zval_ptr_dtor(param);
4682+
zval_ptr_dtor_nogc(param);
46834683
ZVAL_UNDEF(param);
46844684
HANDLE_EXCEPTION();
46854685
}
@@ -5193,13 +5193,13 @@ ZEND_VM_C_LABEL(num_index):
51935193
ZEND_VM_C_GOTO(str_index);
51945194
} else {
51955195
zend_error(E_WARNING, "Illegal offset type");
5196-
zval_ptr_dtor(expr_ptr);
5196+
zval_ptr_dtor_nogc(expr_ptr);
51975197
}
51985198
FREE_OP2();
51995199
} else {
52005200
if (!zend_hash_next_index_insert(Z_ARRVAL_P(EX_VAR(opline->result.var)), expr_ptr)) {
52015201
zend_error(E_WARNING, "Cannot add element to the array as the next element is already occupied");
5202-
zval_ptr_dtor(expr_ptr);
5202+
zval_ptr_dtor_nogc(expr_ptr);
52035203
}
52045204
}
52055205
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
@@ -7150,7 +7150,7 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
71507150
ZVAL_COPY(&c.value, val);
71517151
if (Z_OPT_CONSTANT(c.value)) {
71527152
if (UNEXPECTED(zval_update_constant_ex(&c.value, EX(func)->op_array.scope) != SUCCESS)) {
7153-
zval_ptr_dtor(&c.value);
7153+
zval_ptr_dtor_nogc(&c.value);
71547154
FREE_OP1();
71557155
FREE_OP2();
71567156
HANDLE_EXCEPTION();

0 commit comments

Comments
 (0)