ce97ead399
Merge branch 'PHP-7.1'
2016-12-22 12:47:50 +01:00
175b9f67f6
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 12:47:29 +01:00
25c96f92f4
Fix IS_UNDEF comparisons in opcache
...
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.
Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
2016-12-22 12:46:14 +01:00
b6553d422d
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
2016-12-21 14:27:13 +08:00
82988d3e41
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
...
This reverts commit a12f43ee2c
2016-12-21 14:24:14 +08:00
088dd88eeb
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73792 (invalid foreach loop hangs script)
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 16:54:28 +03:00
6bd41a1d47
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 21:01:21 +08:00
adf0256c4a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Reorder the oplines
2016-12-17 20:09:49 +08:00
a12f43ee2c
Reorder the oplines
...
1. we should only do the return type checking when it is really about to
return
2. for 029.php, actually, the exception threw should be discard while it
jmp into finally(it could be observed by change the return to return an array)
3. after this fix, the test 029.phpt behavior consistently with 7.0
4. good for optimizer too
2016-12-17 20:06:18 +08:00
10b037bc33
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Add an assertion
2016-12-16 11:09:35 +08:00
8ba7878f1b
Add an assertion
2016-12-16 11:09:22 +08:00
8612ac2000
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)
2016-12-16 11:06:50 +08:00
7cef66c635
Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)
2016-12-16 11:06:27 +08:00
9f1e456d5a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed possible false assertion failure
2016-12-08 22:05:17 +08:00
8250b3fca1
Fixed possible false assertion failure
2016-12-08 22:04:43 +08:00
683a0a0f6e
Merge branch 'PHP-7.1'
2016-12-07 23:15:02 +01:00
60249f4390
Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE
...
VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.
2016-12-07 23:14:46 +01:00
6c614cb14c
Merge branch 'PHP-7.1'
2016-12-06 22:26:36 +01:00
76c4a3db08
Fix bug #73668
...
Not bothering to implement special handling to get an accurate
range for this case.
2016-12-06 22:25:35 +01:00
89f8a34483
Merge branch 'PHP-7.1'
2016-12-06 22:12:01 +01:00
d7e7f74b24
Factor out common binary op code in range inference
...
Instead of repeating the same code for binary ops and their
compound assignment variants, factor the range computation out
into a separate function.
2016-12-06 22:09:44 +01:00
795cd6d3a7
Merge branch 'PHP-7.1'
2016-12-05 20:41:21 +01:00
3b79f8f408
Fix bug #73654
2016-12-05 20:41:14 +01:00
9c1920d9e8
Revert "Fix memory leaks with FE_RESET upon empty iterator"
...
This reverts commit 00e516e575
2016-12-02 11:58:36 +03:00
7abf3b56f5
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed access to uninitialized value
2016-12-01 13:26:26 +03:00
54244ba565
Fixed access to uninitialized value
2016-12-01 13:25:50 +03:00
bb78637bda
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Simpler overflow check
fix gcov coverage
2016-12-01 10:34:18 +03:00
54f7abfe7d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Simpler overflow check
fix gcov coverage
2016-12-01 10:34:09 +03:00
003346c450
Simpler overflow check
2016-12-01 10:30:02 +03:00
00e516e575
Fix memory leaks with FE_RESET upon empty iterator
...
Solved by manually freeing and jumping to the opcode *after* FE_FREE
2016-11-30 17:44:34 +01:00
3e9bb03a62
Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUED)
2016-11-28 22:59:57 +03:00
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
d98cc74c16
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)
2016-11-23 14:27:57 +08:00
a0b28434cc
Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)
...
bug was introduced in rev 88eae43f
2016-11-23 14:24:46 +08:00
bfb9be9bd4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
remove TSRMLS_*
2016-11-22 00:33:29 +01:00
d61db8d602
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
remove TSRMLS_*
2016-11-22 00:32:42 +01:00
5e9b4c26a5
remove TSRMLS_*
2016-11-21 23:53:37 +01:00
0004f7e86d
Merge branch 'PHP-7.1'
2016-11-17 13:48:07 +01:00
226b82b127
RC inference fixes
2016-11-17 13:47:36 +01:00
c87ab8aec0
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed 64-bit build
2016-11-17 14:06:09 +03:00
205c69939a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed 64-bit build
2016-11-17 14:05:48 +03:00
c2173c16d0
Fixed 64-bit build
2016-11-17 14:05:22 +03:00
610083bc06
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Overflow check
2016-11-17 13:18:58 +03:00
365d613480
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Overflow check
2016-11-17 13:18:25 +03:00
d4b3f89c53
Overflow check
2016-11-17 13:17:34 +03:00
03ad53741f
Merge branch 'PHP-7.1'
...
* PHP-7.1:
VERIFY_RETURN_TYPE on references can't be eliminated
2016-11-17 10:42:31 +03:00
f8f35d0d4e
VERIFY_RETURN_TYPE on references can't be eliminated
2016-11-17 10:41:42 +03:00
32edd8ff82
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Accorate handling of too big inodes of chroot directories
2016-11-17 01:15:08 +03:00
429bfbd4c2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Accorate handling of too big inodes of chroot directories
2016-11-17 01:14:47 +03:00
27542d9c9d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Accorate handling of too big inodes of chroot directories
2016-11-17 01:14:23 +03:00
Nikita Popov