diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-08 00:12:47 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-08 00:13:23 +0200 |
| commit | 1852f538b9f8d5e7d67fe5a4f6080396d8b10034 (patch) | |
| tree | 7676ec7b47f46ca7d4c057fe885df757f496a46c | |
| parent | a1a83bf5f0f97dbf1a30622ec23365766d590591 (diff) | |
| download | php-git-1852f538b9f8d5e7d67fe5a4f6080396d8b10034.tar.gz | |
ZEND_SEPARATE reuses temporaries
| -rw-r--r-- | Zend/tests/temporary_cleaning_006.phpt | 18 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Zend/tests/temporary_cleaning_006.phpt b/Zend/tests/temporary_cleaning_006.phpt new file mode 100644 index 0000000000..758260d55a --- /dev/null +++ b/Zend/tests/temporary_cleaning_006.phpt @@ -0,0 +1,18 @@ +--TEST-- +Exception after separation during indirect write to fcall result +--FILE-- +<?php + +function throwing() { throw new Exception; } + +function getArray() { return [0]; } + +try { + getArray()[throwing()] = 1; +} catch (Exception $e) { + echo "Exception\n"; +} + +?> +--EXPECT-- +Exception diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 8f3ecddbda..f8d040468f 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -950,6 +950,7 @@ static zend_always_inline uint32_t *generate_var_liveliness_info_ex(zend_op_arra /* the following opcodes reuse TMP created before */ && opline->opcode != ZEND_ROPE_ADD && opline->opcode != ZEND_ADD_ARRAY_ELEMENT + && opline->opcode != ZEND_SEPARATE /* passes fast_call */ && opline->opcode != ZEND_FAST_CALL /* the following opcodes pass class_entry */ @@ -980,6 +981,7 @@ static zend_always_inline uint32_t *generate_var_liveliness_info_ex(zend_op_arra if (Tstart[var] != (uint32_t)-1 /* the following opcodes don't free TMP */ && opline->opcode != ZEND_ROPE_ADD + && opline->opcode != ZEND_SEPARATE && opline->opcode != ZEND_FETCH_LIST && opline->opcode != ZEND_CASE && opline->opcode != ZEND_FE_FETCH_R |