diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-10-09 17:58:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-10-09 17:58:35 +0300 |
| commit | d37f5da75e0789eeb3bddfd5bd569214bd11dc44 (patch) | |
| tree | 42c6ef018519162fb84ccccac80ab30c0066a6c7 /ext | |
| parent | cb657440b4ca81a79deaf74d694d0230db397966 (diff) | |
| download | php-git-d37f5da75e0789eeb3bddfd5bd569214bd11dc44.tar.gz | |
typo and cleanup
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/Optimizer/zend_dump.c | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index cc4602192a..7ec76438bf 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -139,7 +139,7 @@ void zend_dump_var(const zend_op_array *op_array, zend_uchar var_type, int var_n fprintf(stderr, "CV%d($%s)", var_num, op_array->vars[var_num]->val); } else if (var_type == IS_VAR) { fprintf(stderr, "V%d", var_num); - } else if (var_type == IS_TMP_VAR || !(var_type & (IS_VAR|IS_CV))) { + } else if ((var_type & (IS_VAR|IS_TMP_VAR)) == IS_TMP_VAR) { fprintf(stderr, "T%d", var_num); } else { fprintf(stderr, "X%d", var_num); diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index d7f24e47ce..d1084f7648 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -1153,7 +1153,7 @@ static void zend_redo_pass_two(zend_op_array *op_array) case ZEND_IN_ARRAY: case ZEND_ARRAY_KEY_EXISTS: if (opline->result_type & IS_TMP_VAR) { - /* reinitialize result_type od smart branch instructions */ + /* reinitialize result_type of smart branch instructions */ if (opline + 1 < end) { if ((opline+1)->opcode == ZEND_JMPZ && (opline+1)->op1_type == IS_TMP_VAR @@ -1271,7 +1271,7 @@ static void zend_redo_pass_two_ex(zend_op_array *op_array, zend_ssa *ssa) case ZEND_IN_ARRAY: case ZEND_ARRAY_KEY_EXISTS: if (opline->result_type & IS_TMP_VAR) { - /* reinitialize result_type od smart branch instructions */ + /* reinitialize result_type of smart branch instructions */ if (opline + 1 < end) { if ((opline+1)->opcode == ZEND_JMPZ && (opline+1)->op1_type == IS_TMP_VAR |