Dmitry Stogov
0cdbabe558
Merge branch 'nullable_types' of github.com:morrisonlevi/php-src
...
* 'nullable_types' of github.com:morrisonlevi/php-src:
Fix bug #71428
Add nullable parameter types
Implement nullable return types.
2016-05-23 10:14:26 +03:00
Nikita Popov
0d62dfdf81
Improve previous fix
...
Do not mark loop var free blocks as reachable after all -- as we
can't construct SSA for unreachable blocks, this would cause
issues down the line.
Instead add an extra UNREACHABLE_FREE flag and retain only the
FREE instruction during NOP removal. (If we retain all
instructions in the BB we might leave a jump instruction that goes
into the nowhere.)
2016-05-22 00:05:06 +02:00
Nikita Popov
fa9566627b
Fix reachability detection if live ranges aren't split
...
Even if we don't split, we still want to keep the same logic for
reachibility detection.
2016-05-21 20:17:09 +02:00
Bob Weinand
4f077aee83
Allow for [] = $array; (alias for list())
2016-05-20 01:51:05 +02:00
Dmitry Stogov
14a71cf545
Added and fixed tests related to "finally" handling
2016-05-19 13:22:46 +03:00
Dmitry Stogov
88196e9151
Added specialized handler for ZEND_FETCH_DIM_R opcode with only numeric indexes.
2016-05-18 15:06:49 +03:00
Derick Rethans
932c9520bc
Merge branch 'PHP-7.0'
2016-05-18 12:19:58 +01:00
Derick Rethans
c572968900
Merge branch 'PHP-5.6' into PHP-7.0
2016-05-18 12:19:49 +01:00
Derick Rethans
f43f6fc39b
Fixed bug #63740 (strtotime seems to use both sunday and monday as start of week)
2016-05-18 12:19:11 +01:00
Dmitry Stogov
cef8d93edd
Fixed typo
2016-05-18 11:29:02 +03:00
Nikita Popov
14023d39c1
Move builtin_ctzl portability into zend_bitset.h
...
Use this function in both zend_mm_bitset_find_one and
zend_bitset_first.
Maybe zend_bitset.h is not quite the right place for it, but I did
not want to include this in a globally included header like
zend_long.h or zend_portability.h.
2016-05-17 22:23:43 +02:00
Dmitry Stogov
0d77222473
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Use PHP_VERSION as OPcahce version
2016-05-17 17:17:09 +03:00
Dmitry Stogov
d41920c57d
Use PHP_VERSION as OPcahce version
2016-05-17 17:16:10 +03:00
Nikita Popov
b65b15c6f4
Mark assert() as INDIRECT_VAR_ACCESS
...
I don't like this... we may want to detect "obviously not string"
operands by checking for the result of a comparison instruction.
2016-05-17 16:13:17 +02:00
Xinchen Hui
37b1226af1
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
Inlined fast paths of the freqently execute handlers for FETCH_DIM_R.
2016-05-17 20:28:26 +08:00
Xinchen Hui
fad91468db
Revert "Fixed Bug #72213 (Finally leaks on nested exceptions)"
...
This reverts commit 5037ebf058
.
2016-05-17 20:27:16 +08:00
Dmitry Stogov
c466df6813
Inlined fast paths of the freqently execute handlers for FETCH_DIM_R.
2016-05-17 15:08:04 +03:00
Xinchen Hui
0c8879e3da
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Let's only read-only here
2016-05-17 18:07:36 +08:00
Xinchen Hui
2eb7e75c25
Let's only read-only here
2016-05-17 18:07:20 +08:00
Xinchen Hui
b27ecb5026
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 17:41:01 +08:00
Xinchen Hui
60d743dd3b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72229 (Wrong reference when serialize/unserialize an object)
2016-05-17 17:40:37 +08:00
Xinchen Hui
7989db975f
Fixed bug #72229 (Wrong reference when serialize/unserialize an object)
2016-05-17 17:40:26 +08:00
Dmitry Stogov
34a6c93b25
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 11:46:25 +03:00
Xinchen Hui
5037ebf058
Fixed Bug #72213 (Finally leaks on nested exceptions)
2016-05-17 15:32:43 +08:00
Dmitry Stogov
8f7b1a3248
IS_CONST operands don't have to be separated. Use reference-counting instead of duplication.
...
- with opcache all IS_CONST operands are not refcounted (scalars, interned strings or immutable arrays)
- without opcache IS_CONST operands are not shared between processes or threads and may use common reference counters
2016-05-17 08:45:06 +03:00
Dmitry Stogov
1fe7b3bca1
micro-optimisation
2016-05-17 02:09:29 +03:00
Anatol Belski
41cb432ec4
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
Tidy up
Remove unnecessary boundary checks
Resolve bug #72017
2016-05-16 19:31:20 +02:00
Anatol Belski
7e5ea3c305
update NEWS
2016-05-16 19:30:38 +02:00
Thomas Punt
0e21742bf8
Tidy up
2016-05-16 19:15:40 +02:00
Thomas Punt
367fde9947
Remove unnecessary boundary checks
2016-05-16 19:15:40 +02:00
Thomas Punt
39052d4d75
Resolve bug #72017
2016-05-16 19:15:40 +02:00
Xinchen Hui
8ed45fff1a
Merge branch 'PHP-7.0'
2016-05-16 06:24:34 -07:00
Xinchen Hui
6f4860545b
Revert "Revert the ABI break commit"
...
This reverts commit 07220f615b
.
2016-05-16 06:23:55 -07:00
Xinchen Hui
d1d18d5f26
Merge branch 'PHP-7.0'
2016-05-16 06:22:49 -07:00
Xinchen Hui
0b3a4c6101
Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)""
...
obviously I read the change is in argument lists by mistake :<
This reverts commit 9e7afa7514
.
2016-05-16 06:22:13 -07:00
Dmitry Stogov
97bf4e0b12
Check if generator object is created by GENERATOR_CREATE when throw exceptions from generator function
2016-05-16 12:42:13 +03:00
Dmitry Stogov
054446a25f
Extend CAL_FLAGS from 8-bit to 16-bit
2016-05-16 12:41:24 +03:00
Dmitry Stogov
414c4c6776
Revert "Check if generator object is created by GENERATOR_CREATE when throw exceptions from generator function."
...
This reverts commit a9b517c614
.
2016-05-16 11:51:29 +03:00
Dmitry Stogov
a9b517c614
Check if generator object is created by GENERATOR_CREATE when throw exceptions from generator function.
2016-05-16 10:24:13 +03:00
Xinchen Hui
0499f9094f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Correct name, it was typed in habitually
2016-05-16 14:49:22 +08:00
Xinchen Hui
8578fb994b
Correct name, it was typed in habitually
2016-05-16 14:48:13 +08:00
Xinchen Hui
5656292a18
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Revert the ABI break commit
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
2016-05-16 11:25:16 +08:00
Xinchen Hui
07220f615b
Revert the ABI break commit
2016-05-16 11:24:39 +08:00
Xinchen Hui
9e7afa7514
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
...
ABI break
This reverts commit fb951553be
.
2016-05-16 11:24:16 +08:00
Xinchen Hui
3994a70b91
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
improve 7132fe19c2
fix 1bb8a7b0b8
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Conflicts:
acinclude.m4
2016-05-16 11:21:39 +08:00
Xinchen Hui
1559fd7e48
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
2016-05-16 11:19:45 +08:00
Jakub Zelenka
bc63879d46
Update NEWS with info about JSON parser method
2016-05-15 14:15:04 +01:00
Jakub Zelenka
89d02e0019
Merge branch 'json_parser_method'
2016-05-15 13:50:23 +01:00
Anatol Belski
41518d255e
fix dir separator
2016-05-14 23:48:04 +02:00
Nikita Popov
dd8379e046
Inference: $a[]= results in long keys
2016-05-14 17:16:32 +02:00