Skip to content

Commit bac6fdb

Browse files
bwoebibwoebi
committed
Refactor zval cleanup into single function
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
1 parent 59f35c0 commit bac6fdb

21 files changed

+484
-534
lines changed

‎Zend/zend_API.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ ZEND_API int ZEND_FASTCALL zend_parse_arg_str_weak(zval *arg, zend_string **dest
463463

464464
Z_ADDREF_P(z);
465465
if (Z_TYPE_P(z) != IS_OBJECT) {
466-
zval_dtor(arg);
466+
zval_ptr_dtor_nogc(arg);
467467
ZVAL_NULL(arg);
468468
if (!zend_make_printable_zval(z, arg)) {
469469
ZVAL_COPY_VALUE(arg, z);
@@ -3386,7 +3386,7 @@ ZEND_API zend_bool zend_make_callable(zval *callable, zend_string **callable_nam
33863386

33873387
if (zend_is_callable_ex(callable, NULL, IS_CALLABLE_STRICT, callable_name, &fcc, NULL)) {
33883388
if (Z_TYPE_P(callable) == IS_STRING && fcc.calling_scope) {
3389-
zval_dtor(callable);
3389+
zval_ptr_dtor_nogc(callable);
33903390
array_init(callable);
33913391
add_next_index_str(callable, zend_string_copy(fcc.calling_scope->name));
33923392
add_next_index_str(callable, zend_string_copy(fcc.function_handler->common.function_name));
@@ -3951,7 +3951,7 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na
39513951
} else {
39523952
if (property != value) {
39533953
if (Z_ISREF_P(property)) {
3954-
zval_dtor(property);
3954+
zval_ptr_dtor_nogc(property);
39553955
ZVAL_COPY_VALUE(property, value);
39563956
if (Z_REFCOUNTED_P(value) && Z_REFCOUNT_P(value) > 0) {
39573957
zval_opt_copy_ctor(property);

‎Zend/zend_ast.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static int zend_ast_add_array_element(zval *result, zval *offset, zval *expr)
185185
break;
186186
case IS_STRING:
187187
zend_symtable_update(Z_ARRVAL_P(result), Z_STR_P(offset), expr);
188-
zval_dtor(offset);
188+
zval_ptr_dtor_nogc(offset);
189189
break;
190190
case IS_NULL:
191191
zend_symtable_update(Z_ARRVAL_P(result), ZSTR_EMPTY_ALLOC(), expr);
@@ -219,29 +219,29 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
219219
if (UNEXPECTED(zend_ast_evaluate(&op1, ast->child[0], scope) != SUCCESS)) {
220220
ret = FAILURE;
221221
} else if (UNEXPECTED(zend_ast_evaluate(&op2, ast->child[1], scope) != SUCCESS)) {
222-
zval_dtor(&op1);
222+
zval_ptr_dtor_nogc(&op1);
223223
ret = FAILURE;
224224
} else {
225225
binary_op_type op = get_binary_op(ast->attr);
226226
ret = op(result, &op1, &op2);
227-
zval_dtor(&op1);
228-
zval_dtor(&op2);
227+
zval_ptr_dtor_nogc(&op1);
228+
zval_ptr_dtor_nogc(&op2);
229229
}
230230
break;
231231
case ZEND_AST_GREATER:
232232
case ZEND_AST_GREATER_EQUAL:
233233
if (UNEXPECTED(zend_ast_evaluate(&op1, ast->child[0], scope) != SUCCESS)) {
234234
ret = FAILURE;
235235
} else if (UNEXPECTED(zend_ast_evaluate(&op2, ast->child[1], scope) != SUCCESS)) {
236-
zval_dtor(&op1);
236+
zval_ptr_dtor_nogc(&op1);
237237
ret = FAILURE;
238238
} else {
239239
/* op1 > op2 is the same as op2 < op1 */
240240
binary_op_type op = ast->kind == ZEND_AST_GREATER
241241
? is_smaller_function : is_smaller_or_equal_function;
242242
ret = op(result, &op2, &op1);
243-
zval_dtor(&op1);
244-
zval_dtor(&op2);
243+
zval_ptr_dtor_nogc(&op1);
244+
zval_ptr_dtor_nogc(&op2);
245245
}
246246
break;
247247
case ZEND_AST_UNARY_OP:
@@ -250,7 +250,7 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
250250
} else {
251251
unary_op_type op = get_unary_op(ast->attr);
252252
ret = op(result, &op1);
253-
zval_dtor(&op1);
253+
zval_ptr_dtor_nogc(&op1);
254254
}
255255
break;
256256
case ZEND_AST_ZVAL:
@@ -283,16 +283,16 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
283283
}
284284
if (zend_is_true(&op1)) {
285285
if (UNEXPECTED(zend_ast_evaluate(&op2, ast->child[1], scope) != SUCCESS)) {
286-
zval_dtor(&op1);
286+
zval_ptr_dtor_nogc(&op1);
287287
ret = FAILURE;
288288
break;
289289
}
290290
ZVAL_BOOL(result, zend_is_true(&op2));
291-
zval_dtor(&op2);
291+
zval_ptr_dtor_nogc(&op2);
292292
} else {
293293
ZVAL_FALSE(result);
294294
}
295-
zval_dtor(&op1);
295+
zval_ptr_dtor_nogc(&op1);
296296
break;
297297
case ZEND_AST_OR:
298298
if (UNEXPECTED(zend_ast_evaluate(&op1, ast->child[0], scope) != SUCCESS)) {
@@ -303,14 +303,14 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
303303
ZVAL_TRUE(result);
304304
} else {
305305
if (UNEXPECTED(zend_ast_evaluate(&op2, ast->child[1], scope) != SUCCESS)) {
306-
zval_dtor(&op1);
306+
zval_ptr_dtor_nogc(&op1);
307307
ret = FAILURE;
308308
break;
309309
}
310310
ZVAL_BOOL(result, zend_is_true(&op2));
311-
zval_dtor(&op2);
311+
zval_ptr_dtor_nogc(&op2);
312312
}
313-
zval_dtor(&op1);
313+
zval_ptr_dtor_nogc(&op1);
314314
break;
315315
case ZEND_AST_CONDITIONAL:
316316
if (UNEXPECTED(zend_ast_evaluate(&op1, ast->child[0], scope) != SUCCESS)) {
@@ -322,19 +322,19 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
322322
*result = op1;
323323
} else {
324324
if (UNEXPECTED(zend_ast_evaluate(result, ast->child[1], scope) != SUCCESS)) {
325-
zval_dtor(&op1);
325+
zval_ptr_dtor_nogc(&op1);
326326
ret = FAILURE;
327327
break;
328328
}
329-
zval_dtor(&op1);
329+
zval_ptr_dtor_nogc(&op1);
330330
}
331331
} else {
332332
if (UNEXPECTED(zend_ast_evaluate(result, ast->child[2], scope) != SUCCESS)) {
333-
zval_dtor(&op1);
333+
zval_ptr_dtor_nogc(&op1);
334334
ret = FAILURE;
335335
break;
336336
}
337-
zval_dtor(&op1);
337+
zval_ptr_dtor_nogc(&op1);
338338
}
339339
break;
340340
case ZEND_AST_COALESCE:
@@ -346,11 +346,11 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
346346
*result = op1;
347347
} else {
348348
if (UNEXPECTED(zend_ast_evaluate(result, ast->child[1], scope) != SUCCESS)) {
349-
zval_dtor(&op1);
349+
zval_ptr_dtor_nogc(&op1);
350350
ret = FAILURE;
351351
break;
352352
}
353-
zval_dtor(&op1);
353+
zval_ptr_dtor_nogc(&op1);
354354
}
355355
break;
356356
case ZEND_AST_UNARY_PLUS:
@@ -359,7 +359,7 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
359359
} else {
360360
ZVAL_LONG(&op1, 0);
361361
ret = add_function(result, &op1, &op2);
362-
zval_dtor(&op2);
362+
zval_ptr_dtor_nogc(&op2);
363363
}
364364
break;
365365
case ZEND_AST_UNARY_MINUS:
@@ -368,7 +368,7 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
368368
} else {
369369
ZVAL_LONG(&op1, 0);
370370
ret = sub_function(result, &op1, &op2);
371-
zval_dtor(&op2);
371+
zval_ptr_dtor_nogc(&op2);
372372
}
373373
break;
374374
case ZEND_AST_ARRAY:
@@ -380,21 +380,21 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
380380
zend_ast *elem = list->child[i];
381381
if (elem->child[1]) {
382382
if (UNEXPECTED(zend_ast_evaluate(&op1, elem->child[1], scope) != SUCCESS)) {
383-
zval_dtor(result);
383+
zval_ptr_dtor_nogc(result);
384384
return FAILURE;
385385
}
386386
} else {
387387
ZVAL_UNDEF(&op1);
388388
}
389389
if (UNEXPECTED(zend_ast_evaluate(&op2, elem->child[0], scope) != SUCCESS)) {
390-
zval_dtor(&op1);
391-
zval_dtor(result);
390+
zval_ptr_dtor_nogc(&op1);
391+
zval_ptr_dtor_nogc(result);
392392
return FAILURE;
393393
}
394394
if (UNEXPECTED(zend_ast_add_array_element(result, &op1, &op2) != SUCCESS)) {
395-
zval_dtor(&op1);
396-
zval_dtor(&op2);
397-
zval_dtor(result);
395+
zval_ptr_dtor_nogc(&op1);
396+
zval_ptr_dtor_nogc(&op2);
397+
zval_ptr_dtor_nogc(result);
398398
return FAILURE;
399399
}
400400
}
@@ -408,7 +408,7 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
408408
if (UNEXPECTED(zend_ast_evaluate(&op1, ast->child[0], scope) != SUCCESS)) {
409409
ret = FAILURE;
410410
} else if (UNEXPECTED(zend_ast_evaluate(&op2, ast->child[1], scope) != SUCCESS)) {
411-
zval_dtor(&op1);
411+
zval_ptr_dtor_nogc(&op1);
412412
ret = FAILURE;
413413
} else {
414414
zval tmp;
@@ -425,8 +425,8 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc
425425
ZVAL_DUP(result, &tmp);
426426
}
427427
zval_ptr_dtor(&tmp);
428-
zval_dtor(&op1);
429-
zval_dtor(&op2);
428+
zval_ptr_dtor_nogc(&op1);
429+
zval_ptr_dtor_nogc(&op2);
430430
}
431431
break;
432432
default:

‎Zend/zend_compile.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static int lookup_cv(zend_op_array *op_array, zend_string* name) /* {{{ */{
427427

428428
void zend_del_literal(zend_op_array *op_array, int n) /* {{{ */
429429
{
430-
zval_dtor(CT_CONSTANT_EX(op_array, n));
430+
zval_ptr_dtor_nogc(CT_CONSTANT_EX(op_array, n));
431431
if (n + 1 == op_array->last_literal) {
432432
op_array->last_literal--;
433433
} else {
@@ -3276,7 +3276,7 @@ int zend_compile_func_strlen(znode *result, zend_ast_list *args) /* {{{ */
32763276
if (arg_node.op_type == IS_CONST && Z_TYPE(arg_node.u.constant) == IS_STRING) {
32773277
result->op_type = IS_CONST;
32783278
ZVAL_LONG(&result->u.constant, Z_STRLEN(arg_node.u.constant));
3279-
zval_dtor(&arg_node.u.constant);
3279+
zval_ptr_dtor_nogc(&arg_node.u.constant);
32803280
} else {
32813281
zend_emit_op_tmp(result, ZEND_STRLEN, &arg_node, NULL);
32823282
}
@@ -4147,7 +4147,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline) /* {{{ */
41474147
zend_error_noreturn(E_COMPILE_ERROR, "'goto' to undefined label '%s'", Z_STRVAL_P(label));
41484148
}
41494149

4150-
zval_dtor(label);
4150+
zval_ptr_dtor_nogc(label);
41514151
ZVAL_NULL(label);
41524152

41534153
current = opline->extended_value;
@@ -4535,7 +4535,7 @@ void zend_compile_switch(zend_ast *ast) /* {{{ */
45354535
SET_NODE(opline->op1, &expr_node);
45364536
SET_UNUSED(opline->op2);
45374537
} else if (expr_node.op_type == IS_CONST) {
4538-
zval_dtor(&expr_node.u.constant);
4538+
zval_ptr_dtor_nogc(&expr_node.u.constant);
45394539
}
45404540

45414541
efree(jmpnz_opnums);
@@ -4779,7 +4779,7 @@ void zend_compile_declare(zend_ast *ast) /* {{{ */
47794779
zval value_zv;
47804780
zend_const_expr_to_zval(&value_zv, value_ast);
47814781
FC(declarables).ticks = zval_get_long(&value_zv);
4782-
zval_dtor(&value_zv);
4782+
zval_ptr_dtor_nogc(&value_zv);
47834783
} else if (zend_string_equals_literal_ci(name, "encoding")) {
47844784

47854785
if (FAILURE == zend_declare_is_first_statement(ast)) {

‎Zend/zend_constants.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ ZEND_API int zend_register_constant(zend_constant *c)
516516
zend_error(E_NOTICE,"Constant %s already defined", ZSTR_VAL(name));
517517
zend_string_release(c->name);
518518
if (!(c->flags & CONST_PERSISTENT)) {
519-
zval_dtor(&c->value);
519+
zval_ptr_dtor_nogc(&c->value);
520520
}
521521
ret = FAILURE;
522522
}

‎Zend/zend_execute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ static zend_always_inline void i_free_compiled_variables(zend_execute_data *exec
20912091
if (!Z_DELREF_P(cv)) {
20922092
zend_refcounted *r = Z_COUNTED_P(cv);
20932093
ZVAL_NULL(cv);
2094-
zval_dtor_func_for_ptr(r);
2094+
zval_dtor_func(r);
20952095
} else {
20962096
GC_ZVAL_CHECK_POSSIBLE_ROOT(cv);
20972097
}

‎Zend/zend_execute.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval
9898
Z_ADDREF_P(variable_ptr);
9999
}
100100
}
101-
zval_dtor_func_for_ptr(garbage);
101+
zval_dtor_func(garbage);
102102
return variable_ptr;
103103
} else { /* we need to split */
104104
/* optimized version of GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr) */
@@ -220,7 +220,7 @@ static zend_always_inline void zend_vm_stack_free_extra_args_ex(uint32_t call_in
220220
if (!Z_DELREF_P(p)) {
221221
zend_refcounted *r = Z_COUNTED_P(p);
222222
ZVAL_NULL(p);
223-
zval_dtor_func_for_ptr(r);
223+
zval_dtor_func(r);
224224
} else {
225225
GC_ZVAL_CHECK_POSSIBLE_ROOT(p);
226226
}
@@ -248,7 +248,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call)
248248
if (!Z_DELREF_P(p)) {
249249
zend_refcounted *r = Z_COUNTED_P(p);
250250
ZVAL_NULL(p);
251-
zval_dtor_func_for_ptr(r);
251+
zval_dtor_func(r);
252252
}
253253
}
254254
} while (p != end);

‎Zend/zend_execute_API.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k
10171017
zend_exception_restore();
10181018

10191019
zval_ptr_dtor(&args[0]);
1020-
zval_dtor(&fcall_info.function_name);
1020+
zval_ptr_dtor_nogc(&fcall_info.function_name);
10211021

10221022
zend_hash_del(EG(in_autoload), lc_name);
10231023

@@ -1127,7 +1127,7 @@ ZEND_API int zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr, char
11271127
} else {
11281128
retval = FAILURE;
11291129
}
1130-
zval_dtor(&pv);
1130+
zval_ptr_dtor_nogc(&pv);
11311131
return retval;
11321132
}
11331133
/* }}} */

‎Zend/zend_gc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ ZEND_API void ZEND_FASTCALL gc_possible_root(zend_refcounted *ref)
243243
gc_collect_cycles();
244244
GC_REFCOUNT(ref)--;
245245
if (UNEXPECTED(GC_REFCOUNT(ref)) == 0) {
246-
zval_dtor_func_for_ptr(ref);
246+
zval_dtor_func(ref);
247247
return;
248248
}
249249
if (UNEXPECTED(GC_INFO(ref))) {

‎Zend/zend_inheritance.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
660660
int parent_num = OBJ_PROP_TO_NUM(parent_info->offset);
661661
int child_num = OBJ_PROP_TO_NUM(child_info->offset);
662662

663-
/* Don't keep default properties in GC (thry may be freed by opcache) */
663+
/* Don't keep default properties in GC (they may be freed by opcache) */
664664
zval_ptr_dtor_nogc(&(ce->default_properties_table[parent_num]));
665665
ce->default_properties_table[parent_num] = ce->default_properties_table[child_num];
666666
ZVAL_UNDEF(&ce->default_properties_table[child_num]);

‎Zend/zend_ini_parser.y‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ statement:
313313
if (Z_TYPE($2) == IS_STRING) {
314314
zend_string_release(Z_STR($2));
315315
} else {
316-
zval_dtor(&$2);
316+
zval_ptr_dtor_nogc(&$2);
317317
}
318318
zval_ptr_dtor(&$5);
319319
}

0 commit comments

Comments
 (0)