diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-05-05 23:31:57 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-05-05 23:31:57 +0200 |
| commit | bac6fdb0c52c924e726c5a78de8858bf27b6586b (patch) | |
| tree | 627f2ec8d91955e99456783aebd94ac5d4236f32 /Zend/zend_vm_gen.php | |
| parent | 59f35c0ca9abfa72c5393f6c0350759a3f6512d8 (diff) | |
| download | php-git-bac6fdb0c52c924e726c5a78de8858bf27b6586b.tar.gz | |
Refactor zval cleanup into single function
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
Diffstat (limited to 'Zend/zend_vm_gen.php')
| -rw-r--r-- | Zend/zend_vm_gen.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 1f4bb884d2..30f8f7d91f 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -479,7 +479,7 @@ $op2_free_op = array( ); $op1_free_op_if_var = array( - "ANY" => "if (opline->op1_type == IS_VAR) {zval_ptr_dtor_nogc(free_op1);}", + "ANY" => "if (opline->op1_type == IS_VAR) { zval_ptr_dtor_nogc(free_op1); }", "TMP" => "", "VAR" => "zval_ptr_dtor_nogc(free_op1)", "CONST" => "", @@ -490,7 +490,7 @@ $op1_free_op_if_var = array( ); $op2_free_op_if_var = array( - "ANY" => "if (opline->op2_type == IS_VAR) {zval_ptr_dtor_nogc(free_op2);}", + "ANY" => "if (opline->op2_type == IS_VAR) { zval_ptr_dtor_nogc(free_op2); }", "TMP" => "", "VAR" => "zval_ptr_dtor_nogc(free_op2)", "CONST" => "", @@ -501,9 +501,9 @@ $op2_free_op_if_var = array( ); $op1_free_op_var_ptr = array( - "ANY" => "if (free_op1) {zval_ptr_dtor_nogc(free_op1);}", + "ANY" => "if (free_op1) { zval_ptr_dtor_nogc(free_op1); }", "TMP" => "", - "VAR" => "if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}", + "VAR" => "if (UNEXPECTED(free_op1)) { zval_ptr_dtor_nogc(free_op1); }", "CONST" => "", "UNUSED" => "", "CV" => "", @@ -512,9 +512,9 @@ $op1_free_op_var_ptr = array( ); $op2_free_op_var_ptr = array( - "ANY" => "if (free_op2) {zval_ptr_dtor_nogc(free_op2);}", + "ANY" => "if (free_op2) { zval_ptr_dtor_nogc(free_op2); }", "TMP" => "", - "VAR" => "if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);}", + "VAR" => "if (UNEXPECTED(free_op2)) { zval_ptr_dtor_nogc(free_op2); }", "CONST" => "", "UNUSED" => "", "CV" => "", |