diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-26 16:12:47 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-26 16:12:47 +0200 |
| commit | ade97c207c74609332e7d98450ef09b5caec0a70 (patch) | |
| tree | 75825d7d6daf070d97c81be95f463e5dcce3f2d6 /Zend/zend_opcode.c | |
| parent | 0ab4fca8e3f126649901f7a33e3dd8c320d7022e (diff) | |
| parent | e2b49d6c45f0c5ed69268d32da2f4972265db663 (diff) | |
| download | php-git-ade97c207c74609332e7d98450ef09b5caec0a70.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 1c4f812af3..54886a3d07 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -655,6 +655,12 @@ static void emit_live_range( default: start++; kind = ZEND_LIVE_TMPVAR; + + /* Check hook to determine whether a live range is necessary, + * e.g. based on type info. */ + if (needs_live_range && !needs_live_range(op_array, orig_def_opline)) { + return; + } break; } case ZEND_COPY_TMP: @@ -694,11 +700,6 @@ static void emit_live_range( } } - /* Check hook to determine whether a live range is necessary, e.g. based on type info. */ - if (needs_live_range && !needs_live_range(op_array, orig_def_opline)) { - return; - } - emit_live_range_raw(op_array, var_num, kind, start, end); } |