com php-src: Avoid duplication: Zend/zend_vm_def.h Zend /zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 07 Dec 2017 11:59:42 +0000 |
| Subject: | com php-src: Avoid duplication: Zend/zend_vm_def.h Zend /zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100519@lists.php.net to get a copy of this message | ||
Commit: 2d8f238318dc6a92c414d6b73c062d519fd4aad8
Author: Dmitry Stogov <dmitry@zend.com> Thu, 7 Dec 2017 14:59:42 +0300
Parents: fd453aa1d13847f8b2176af293f5a420b94b5d6a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d8f238318dc6a92c414d6b73c062d519fd4aad8
Log:
Avoid duplication
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5245c8c..726c8ab 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1147,8 +1147,7 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV,
CONST|TMPVAR|CV,
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -1278,8 +1277,7 @@ ZEND_VM_HANDLER(36, ZEND_POST_INC, VAR|CV, ANY)
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
@@ -1311,8 +1309,7 @@ ZEND_VM_HANDLER(37, ZEND_POST_DEC, VAR|CV, ANY)
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f4ac49b..1e5bea2 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -22442,8 +22442,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_POST_INC_SPEC_VAR_HANDLER(ZEND
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
@@ -22475,8 +22474,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_POST_DEC_SPEC_VAR_HANDLER(ZEND
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
@@ -24639,8 +24637,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -27069,8 +27066,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -30931,8 +30927,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -33305,8 +33300,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -35155,8 +35149,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -37531,8 +37524,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result..var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -39224,8 +39216,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
increment_function(var_ptr);
@@ -39256,8 +39247,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_
var_ptr = GET_OP1_UNDEF_CV(var_ptr, BP_VAR_RW);
}
ZVAL_DEREF(var_ptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
- zval_opt_copy_ctor(var_ptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
decrement_function(var_ptr);
@@ -41993,8 +41983,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -46085,8 +46074,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result..var), zptr);
if (inc) {
increment_function(zptr);
} else {
@@ -51873,8 +51861,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
zend_post_incdec_property_helper_SP
}
} else {
ZVAL_DEREF(zptr);
- ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr);
- zval_opt_copy_ctor(zptr);
+ ZVAL_COPY(EX_VAR(opline->result.var), zptr);
if (inc) {
increment_function(zptr);
} else {