Nikita Popov
949aaea66e
Don't insert duplicate predecessors
...
Otherwise we'll get corrupt phis
2016-01-24 23:03:57 +01:00
Nikita Popov
cf6aa46dbd
Fix SSA for ZEND_YIELD
...
Yield-by-ref defs a ref var, yield-by-var only defs an rc1/rcn var
if rc inference is used.
Also move BIND_LEXICAL where it belongs in DFG construction.
2016-01-24 23:03:50 +01:00
Bob Weinand
9017bb94d4
Merge branch 'PHP-7.0'
2016-01-24 19:55:31 +01:00
Bob Weinand
001ce475ee
Fixed bug #71441 (Typehinted Generator with return in try/finally crashes)
2016-01-24 19:55:16 +01:00
Xinchen Hui
6d674b3d91
Merge branch 'PHP-7.0'
2016-01-24 03:57:17 -08:00
Xinchen Hui
d74cc3afcf
Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant)
2016-01-24 03:56:47 -08:00
Xinchen Hui
ae122bf7ad
Fixed warning of incompatible pointer
2016-01-23 22:49:15 -08:00
Bob Weinand
cc9445ce68
Merge branch 'PHP-7.0'
2016-01-23 18:17:18 +01:00
Bob Weinand
65ef7f8c33
Use uint64_t for flags (warning)
2016-01-23 18:16:57 +01:00
Jakub Zelenka
1091cec28f
Update NEWS and UPGRADING for PR #1701
2016-01-22 19:41:11 +00:00
Eddie Kohler
104876dd8e
json_encode: Escape U+2028 and U+2029 more often.
...
These characters are illegal in Javascript, so leaving them unescaped
is risky. The default encoder ($flags = 0) is fine, but the encoder
with JSON_UNESCAPED_UNICODE flag is not.
In case anyone wants the ability to leave these characters unescaped,
provide JSON_UNESCAPED_LINE_TERMINATORS.
2016-01-22 19:40:58 +00:00
Dmitry Stogov
9b854ebab4
More accurate handling of isset() and unset()
2016-01-22 13:32:20 +03:00
Dmitry Stogov
79071fe227
Added optimization constraint (don't optimize result of NEW, because constructor may throw exception)
2016-01-22 13:30:34 +03:00
Xinchen Hui
0df9b51479
Return meaningful value
2016-01-22 15:34:56 +08:00
Xinchen Hui
9b61479166
We don't need to dup zend_class_constant here.
...
quote why the internal class is still using duplication:
```
for internal classes, the zend_class_constant is malloc-ed. we need to
free it.
if (const->ce == ce) {
zval_ptr_dtor(&const->value);
free(const)
}
so, if two classes share one const, and it(parent class) was freed
before, this read(in child class, const->ce) is invalid..
and destroy_zend_class is called via zend_hash_destroy(class_table).
which is not in reverse order... so, parent classes are dtor first.
if we want this work, we should change that order.
```
2016-01-22 11:22:37 +08:00
Nikita Popov
af255c67eb
Make op1/op2 decoding in phpdbg more complete
2016-01-21 21:58:23 +01:00
Nikita Popov
b1e4883d26
Don't print try-catch offset for FAST_RET w/o ev
2016-01-21 21:53:13 +01:00
Nikita Popov
7899498c6f
Mark op1 of INIT_FCALL as NUM
2016-01-21 21:31:14 +01:00
Nikita Popov
9b57e07298
Consolidate op1/op2 vm flags
2016-01-21 21:15:05 +01:00
Andrey Hristov
64cb71cc8b
Add missing macro
2016-01-21 12:59:23 +01:00
Xinchen Hui
4ed5b4cdf5
Typo (SKIPF -> SKIPIF)
2016-01-21 15:27:53 +08:00
Xinchen Hui
b27e10284a
Empty line
2016-01-21 14:37:54 +08:00
Xinchen Hui
145555f81c
Cover overloaded functions
2016-01-21 14:31:03 +08:00
Xinchen Hui
2ee73ee094
Let's add a class entry for testing
2016-01-21 13:53:29 +08:00
Xinchen Hui
62f3e5adf8
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
re-arrange NEWS
5.6.19 will be next
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
fix ReflectionClass::__toString doc block omitted
fix ReflectionClass::__toString doc block omitted
improve fix for bug #71201
improve fix for bug #71201
2016-01-21 13:32:08 +08:00
Xinchen Hui
62c1c11ad3
Fixed bug #71413 (Crash with constants on internal interfaces)
2016-01-21 13:30:41 +08:00
Ferenc Kovacs
50c255d16c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
re-arrange NEWS
2016-01-21 02:25:39 +01:00
Ferenc Kovacs
ec85410eb2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
re-arrange NEWS
2016-01-21 02:25:23 +01:00
Ferenc Kovacs
848de651a2
re-arrange NEWS
2016-01-21 02:24:51 +01:00
Ferenc Kovacs
ada6fb0792
Merge branch 'PHP-7.0'
...
* PHP-7.0:
5.6.19 will be next
2016-01-20 15:43:49 +01:00
Ferenc Kovacs
f636f4c9a3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.6.19 will be next
2016-01-20 15:43:15 +01:00
Ferenc Kovacs
a4fc2e1eb2
5.6.19 will be next
2016-01-20 15:39:05 +01:00
Remi Collet
544f8a0794
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
fix ReflectionClass::__toString doc block omitted
2016-01-20 13:11:13 +01:00
Remi Collet
e58cf4f996
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
2016-01-20 13:10:56 +01:00
Remi Collet
3c8f287d58
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message)
...
Fix skip message to work
2016-01-20 13:08:58 +01:00
Joe Watkins
7d100866ec
Merge branch 'master' of https://github.com/php/php-src
2016-01-20 10:55:09 +00:00
Joe Watkins
11cf826b89
fix ReflectionClass::__toString doc block omitted
2016-01-20 10:54:55 +00:00
Joe Watkins
98164714ea
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-01-20 10:52:57 +00:00
Joe Watkins
b899656eb0
fix ReflectionClass::__toString doc block omitted
2016-01-20 10:52:27 +00:00
Anatol Belski
d284072f78
Merge branch 'PHP-7.0'
...
* PHP-7.0:
improve fix for bug #71201
improve fix for bug #71201
2016-01-20 09:46:58 +01:00
Anatol Belski
4b97237374
improve fix for bug #71201
2016-01-20 09:46:09 +01:00
Anatol Belski
a63904b150
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
improve fix for bug #71201
2016-01-20 09:45:49 +01:00
Anatol Belski
508d1dae25
improve fix for bug #71201
2016-01-20 09:44:28 +01:00
Nikita Popov
dcf3db6ac8
Mark isset($$var) as INDIRECT_VAR_ACCESS
2016-01-19 22:26:32 +01:00
Nikita Popov
5662d73528
Add support for Pi type constraints
...
Supports TYPE_CHECK and IS_IDENTICAL for now.
2016-01-19 22:09:29 +01:00
Dmitry Stogov
a8900b5636
Typo (ASSESS->ACCESS)
2016-01-19 15:54:44 +03:00
Dmitry Stogov
a2ff3a46a4
Use ZEND_FUNC_INDIRECT_VAR_ASSESS instead of ZEND_FUNC_TOO_DYNAMIC. Handle function with exceptions handlers and generators separately.
2016-01-19 15:33:08 +03:00
Anatol Belski
29176aaa01
vc doesn't support #warning
2016-01-19 12:14:59 +01:00
Anatol Belski
60d98605ca
reorder comments
2016-01-19 09:04:52 +01:00
Anatol Belski
03263fded1
get rid of win32_ prefix
2016-01-19 09:02:12 +01:00