com php-src: After DFA pass result of FE_FETCH may be C V: ext/opcache/Optimizer/zend_inference.c
| From: | Dmitry Stogov | Date: | Tue, 09 Feb 2016 09:16:17 +0000 |
| Subject: | com php-src: After DFA pass result of FE_FETCH may be C V: ext/opcache/Optimizer/zend_inference.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90972@lists.php.net to get a copy of this message | ||
Commit: f4bec6e1371b6bcb0069d9025d88bce003b11420
Author: Dmitry Stogov <dmitry@zend.com> Tue, 9 Feb 2016 12:16:17 +0300
Parents: 4fcc3f77115e7d0365afce2ae7d2148a5c5f8179
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4bec6e1371b6bcb0069d9025d88bce003b11420
Log:
After DFA pass result of FE_FETCH may be CV
Changed paths:
M ext/opcache/Optimizer/zend_inference.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index aa78e3e..2dab5aa 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -3427,24 +3427,22 @@ static void zend_update_type_info(const zend_op_array *op_array,
}
}
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def);
- if (opline->result_type == IS_TMP_VAR) {
- if (ssa_ops[i].result_def >= 0) {
- tmp = MAY_BE_RC1;
- if (t1 & MAY_BE_OBJECT) {
- tmp |= MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY |
MAY_BE_ARRAY_OF_REF;
- } else if (t1 & MAY_BE_ARRAY) {
- if (t1 & MAY_BE_ARRAY_KEY_LONG) {
- tmp |= MAY_BE_LONG;
- }
- if (t1 & MAY_BE_ARRAY_KEY_STRING) {
- tmp |= MAY_BE_STRING;
- }
- if (!(tmp & (MAY_BE_LONG|MAY_BE_STRING))) {
- tmp |= MAY_BE_NULL;
- }
+ if (ssa_ops[i].result_def >= 0) {
+ tmp = MAY_BE_RC1;
+ if (t1 & MAY_BE_OBJECT) {
+ tmp |= MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY |
MAY_BE_ARRAY_OF_REF;
+ } else if (t1 & MAY_BE_ARRAY) {
+ if (t1 & MAY_BE_ARRAY_KEY_LONG) {
+ tmp |= MAY_BE_LONG;
+ }
+ if (t1 & MAY_BE_ARRAY_KEY_STRING) {
+ tmp |= MAY_BE_STRING;
+ }
+ if (!(tmp & (MAY_BE_LONG|MAY_BE_STRING))) {
+ tmp |= MAY_BE_NULL;
}
- UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
}
+ UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
}
break;
// case ZEND_CATCH: