diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-28 00:07:04 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-28 00:07:04 +0100 |
| commit | 2d069f640e6cccfa3ba8b1e4f375ade20fb33f64 (patch) | |
| tree | e6edf9822fe559eae0506c75c83286d404c822be /Zend/zend_opcode.c | |
| parent | f13da5b0d72dc8dfcc5e7d4ae11556a92c36ce53 (diff) | |
| parent | ec39802e4e7dac14b629f41017d04573a6a5fdc4 (diff) | |
| download | php-git-2d069f640e6cccfa3ba8b1e4f375ade20fb33f64.tar.gz | |
Merge branch 'coalesce_operator'
* coalesce_operator:
Extended coalesce operator test case for ordering/short-circuiting
Ensure not evaluated twice
Added test
Initial coalesce operator implementation
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 3397ed28e2..5902abd4c5 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -741,6 +741,7 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC) case ZEND_JMPZ_EX: case ZEND_JMPNZ_EX: case ZEND_JMP_SET: + case ZEND_COALESCE: case ZEND_NEW: case ZEND_FE_RESET: case ZEND_FE_FETCH: |