From 1833ab0230d4eb78ad4082b6986b8f1aae9cc40d Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 25 Sep 2014 17:00:17 +0400 Subject: [PATCH] Use macro --- Zend/zend_vm_def.h | 12 ++---------- Zend/zend_vm_execute.h | 24 ++++-------------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index fe8a2e766c..0162902c48 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -974,11 +974,7 @@ ZEND_VM_HANDLER(36, ZEND_POST_INC, VAR|CV, ANY) ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } increment_function(var_ptr); @@ -1018,11 +1014,7 @@ ZEND_VM_HANDLER(37, ZEND_POST_DEC, VAR|CV, ANY) ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } decrement_function(var_ptr); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 3d81d24b56..df53c72ed9 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -15426,11 +15426,7 @@ static int ZEND_FASTCALL ZEND_POST_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } increment_function(var_ptr); @@ -15470,11 +15466,7 @@ static int ZEND_FASTCALL ZEND_POST_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } decrement_function(var_ptr); @@ -32700,11 +32692,7 @@ static int ZEND_FASTCALL ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } increment_function(var_ptr); @@ -32743,11 +32731,7 @@ static int ZEND_FASTCALL ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS ZVAL_DUP(EX_VAR(opline->result.var), var_ptr); } else { ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr); - if (Z_OPT_IMMUTABLE_P(var_ptr) || Z_OPT_COPYABLE_P(var_ptr)) { - zval_copy_ctor_func(var_ptr); - } else if (Z_OPT_REFCOUNTED_P(var_ptr)) { - Z_ADDREF_P(var_ptr); - } + zval_opt_copy_ctor(var_ptr); } decrement_function(var_ptr); -- 2.40.0