com php-src: Fixed typo: Zend/zend_vm_def.h Zend/zend _vm_execute.h
| From: | Dmitry Stogov | Date: | Wed, 16 Apr 2014 12:35:41 +0000 |
| Subject: | com php-src: Fixed typo: Zend/zend_vm_def.h Zend/zend _vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77373@lists.php.net to get a copy of this message | ||
Commit: 533a8b65f8a5f29a8907e066ba368a7449f0edc1
Author: Dmitry Stogov <dmitry@zend.com> Wed, 16 Apr 2014 16:35:41 +0400
Parents: be60f90dd7eadaa4f8d4c65e92442d87d327b235
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=533a8b65f8a5f29a8907e066ba368a7449f0edc1
Log:
Fixed typo
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 fa606eb..d214459 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5326,7 +5326,7 @@ ZEND_VM_HANDLER(160, ZEND_YIELD, CONST|TMP|VAR|CV|UNUSED,
CONST|TMP|VAR|CV|UNUSE
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
FREE_OP2_IF_VAR();
} else {
- if (OP1_TYPE == IS_CV) {
+ if (OP2_TYPE == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index fa5f6a0..adc978e 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -4923,7 +4923,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CONST == IS_CV) {
+ if (IS_TMP_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -5864,7 +5864,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
zval_ptr_dtor_nogc(free_op2.var);
} else {
- if (IS_CONST == IS_CV) {
+ if (IS_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -6514,7 +6514,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDL
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CONST == IS_CV) {
+ if (IS_UNUSED == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -7210,7 +7210,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CONST == IS_CV) {
+ if (IS_CV == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -9127,7 +9127,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_TMP_VAR == IS_CV) {
+ if (IS_CONST == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -10712,7 +10712,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_AR
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
zval_ptr_dtor_nogc(free_op2.var);
} else {
- if (IS_TMP_VAR == IS_CV) {
+ if (IS_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -11230,7 +11230,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_TMP_VAR == IS_CV) {
+ if (IS_UNUSED == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -11871,7 +11871,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_TMP_VAR == IS_CV) {
+ if (IS_CV == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -15557,7 +15557,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_VAR == IS_CV) {
+ if (IS_CONST == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -17466,7 +17466,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_AR
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_VAR == IS_CV) {
+ if (IS_TMP_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -20883,7 +20883,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_VAR == IS_CV) {
+ if (IS_UNUSED == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -22845,7 +22845,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_VAR == IS_CV) {
+ if (IS_CV == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -24237,7 +24237,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDL
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_UNUSED == IS_CV) {
+ if (IS_CONST == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -25466,7 +25466,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_UNUSED == IS_CV) {
+ if (IS_TMP_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -26695,7 +26695,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
zval_ptr_dtor_nogc(free_op2.var);
} else {
- if (IS_UNUSED == IS_CV) {
+ if (IS_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -28412,7 +28412,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_UNUSED == IS_CV) {
+ if (IS_CV == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -31711,7 +31711,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CV == IS_CV) {
+ if (IS_CONST == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -33503,7 +33503,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CV == IS_CV) {
+ if (IS_TMP_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -35655,7 +35655,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
zval_ptr_dtor_nogc(free_op2.var);
} else {
- if (IS_CV == IS_CV) {
+ if (IS_VAR == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);
@@ -36668,7 +36668,7 @@ static int ZEND_FASTCALL
ZEND_YIELD_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
ZVAL_DUP(&generator->key, Z_REFVAL_P(key));
} else {
- if (IS_CV == IS_CV) {
+ if (IS_UNUSED == IS_CV) {
if (Z_REFCOUNTED_P(key)) Z_ADDREF_P(key);
}
ZVAL_COPY_VALUE(&generator->key, key);