com php-src: Avoid construction of empty live-ranges because of OP_DATA instruction: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Tue, 08 Dec 2015 15:10:07 +0000 |
| Subject: | com php-src: Avoid construction of empty live-ranges because of OP_DATA instruction: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90135@lists.php.net to get a copy of this message | ||
Commit: c1803bf6528983a760fc59f9f70dc94fac1c03d6
Author: Dmitry Stogov <dmitry@zend.com> Tue, 8 Dec 2015 18:10:07 +0300
Parents: 964b40dd37179b7cb95788703de83e4319c97062
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1803bf6528983a760fc59f9f70dc94fac1c03d6
Log:
Avoid construction of empty live-ranges because of OP_DATA instruction
Changed paths:
M Zend/zend_compile..c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 1e38caf..d304a6b 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1945,10 +1945,14 @@ static void zend_find_live_range(zend_op *opline, zend_uchar type, uint32_t
var)
static zend_always_inline int zend_is_def_range(zend_op *opline, zend_uchar type, uint32_t var) /*
{{{ */
{
- return opline->result_type == type &&
- opline->result.var == var &&
- opline->opcode != ZEND_ADD_ARRAY_ELEMENT &&
- opline->opcode != ZEND_ROPE_ADD;
+ if (opline->result_type == type && opline->result.var == var) {
+ return opline->opcode != ZEND_ADD_ARRAY_ELEMENT &&
+ opline->opcode != ZEND_ROPE_ADD;
+ } else if (opline->opcode == ZEND_OP_DATA) {
+ return (opline-1)->result_type == type &&
+ (opline-1)->result.var == var;
+ }
+ return 0;
}
/* }}} */